From 4711ef1f41f8cb070507f9c4feb72165b96f3049 Mon Sep 17 00:00:00 2001 From: "Chang, Matt" Date: Tue, 25 Jul 2023 16:22:46 +0800 Subject: [PATCH] Remove old MSVC & MinGW compiler versions - fix vs2013 build failure by adding a missing header --- app/src/generalpage.cpp | 1 + util/appveyor-mingw.yml | 26 +------------------------- util/appveyor-msvc.yml | 24 +----------------------- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/app/src/generalpage.cpp b/app/src/generalpage.cpp index 1dcb1dde3..9a931b574 100644 --- a/app/src/generalpage.cpp +++ b/app/src/generalpage.cpp @@ -17,6 +17,7 @@ GNU General Public License for more details. #include "generalpage.h" +#include #include #include #include diff --git a/util/appveyor-mingw.yml b/util/appveyor-mingw.yml index 06f45461a..894be6320 100644 --- a/util/appveyor-mingw.yml +++ b/util/appveyor-mingw.yml @@ -1,10 +1,8 @@ -clone_depth: 3 +clone_depth: 1 image: - Visual Studio 2019 - - Visual Studio 2017 - - Visual Studio 2015 platform: - x86 @@ -19,8 +17,6 @@ skip_commits: init: - ver - echo %PLATFORM% -# - dir C:\Qt -# - dir C:\Qt\Tools\ before_build: - set QTDIR=C:\Qt\%qt% @@ -51,23 +47,3 @@ for: - if %PLATFORM%==x64 set qt=5.15\mingw81_64 - if %PLATFORM%==x86 set mingw=mingw810_32 - if %PLATFORM%==x64 set mingw=mingw810_64 -- matrix: - only: - - image: Visual Studio 2017 - install: - - if %PLATFORM%==x86 set qt=5.12\mingw73_32 - - if %PLATFORM%==x64 set qt=5.12\mingw73_64 - - if %PLATFORM%==x86 set mingw=mingw730_32 - - if %PLATFORM%==x64 set mingw=mingw730_64 - -- matrix: - only: - - image: Visual Studio 2015 - install: - - if %PLATFORM%==x86 set qt=5.9\mingw53_32 - - if %PLATFORM%==x86 set mingw=mingw530_32 - -matrix: - exclude: - - image: Visual Studio 2015 - platform: x64 diff --git a/util/appveyor-msvc.yml b/util/appveyor-msvc.yml index a5cf03449..eed19612f 100644 --- a/util/appveyor-msvc.yml +++ b/util/appveyor-msvc.yml @@ -1,10 +1,8 @@ -clone_depth: 3 +clone_depth: 1 image: - Visual Studio 2019 - - Visual Studio 2017 - - Visual Studio 2015 - Visual Studio 2013 platform: @@ -49,26 +47,6 @@ for: - if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - if %PLATFORM%==x86 set qt=5.15\msvc2019 - if %PLATFORM%==x64 set qt=5.15\msvc2019_64 - -- matrix: - only: - - image: Visual Studio 2017 - install: - - if %PLATFORM%==x86 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" - - if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - - if %PLATFORM%==x86 set qt=5.12\msvc2017 - - if %PLATFORM%==x64 set qt=5.12\msvc2017_64 - -- matrix: - only: - - image: Visual Studio 2015 - install: - - if %PLATFORM%==x86 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - if %PLATFORM%==x64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - if %PLATFORM%==x64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - - if %PLATFORM%==x86 set qt=5.9\msvc2015 - - if %PLATFORM%==x64 set qt=5.9\msvc2015_64 - - matrix: only: - image: Visual Studio 2013