diff options
| author | psi29a <psi29a@gmail.com> | 2022-01-18 23:29:46 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2022-01-18 23:29:46 +0000 |
| commit | b3bbcef25eba9825fbeaecfd0fab8f3d982ff4e4 (patch) | |
| tree | 03efda8b500f3ca8733a4b483d91ef9554a99ed1 | |
| parent | 088c4597713e56c5b612684baeaf840413060885 (diff) | |
| parent | bdd13f36b2d0f6f9391f063f8adfe97f897f5877 (diff) | |
Merge branch 'make_appveyor_great_again' into 'master'
do some Appveyor Qt magic to get it all sorted
See merge request OpenMW/openmw!1564
| -rw-r--r-- | CI/before_script.msvc.sh | 8 | ||||
| -rw-r--r-- | appveyor.yml | 26 |
2 files changed, 16 insertions, 18 deletions
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 32169fc04b..aaf459611e 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -878,7 +878,13 @@ fi done echo Done. else - QT_SDK="C:/Qt/5.13/msvc2017${SUFFIX}" + # default to msvc2019 which pre-loads Qt 5.15.2 + qt_version="5.15.2" + if [ "msvc${MSVC_REAL_YEAR}" == "msvc2017" ]; then + qt_version="5.13" + fi + QT_SDK="C:/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}" + add_cmake_opts -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \ -DCMAKE_PREFIX_PATH="$QT_SDK" for CONFIGURATION in ${CONFIGURATIONS[@]}; do diff --git a/appveyor.yml b/appveyor.yml index e2c13ed948..95f070a662 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,6 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: -# - Win32 - x64 configuration: @@ -22,26 +21,20 @@ configuration: - Release # - RelWithDebInfo -# For the Qt, Boost, CMake, etc installs -#os: Visual Studio 2017 - # We want the git revision for versioning, # so shallow clones don't work. clone_depth: 1 cache: - - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win32.7z - - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win64.7z - - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win32.7z - - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win64.7z - - C:\projects\openmw\deps\OSG-3.4.1-scrawl-msvc2015-win32.7z - - C:\projects\openmw\deps\OSG-3.4.1-scrawl-msvc2015-win64.7z - - C:\projects\openmw\deps\ffmpeg-3.2.4-dev-win32.zip - - C:\projects\openmw\deps\ffmpeg-3.2.4-dev-win64.zip - - C:\projects\openmw\deps\ffmpeg-3.2.4-win32.zip - - C:\projects\openmw\deps\ffmpeg-3.2.4-win64.zip - - C:\projects\openmw\deps\OpenAL-Soft-1.19.1.zip - - C:\projects\openmw\deps\SDL2-2.0.7.zip + - C:\projects\openmw\deps\Bullet-2.89-msvc2017-win64-double.7z + - C:\projects\openmw\deps\MyGUI-3.4.1-msvc2017-win64.7z + - C:\projects\openmw\deps\MyGUI-3.4.1-msvc2019-win64.7z + - C:\projects\openmw\deps\OSGoS-3.6.5-b02abe2-msvc2017-win64.7z + - C:\projects\openmw\deps\OSGoS-3.6.5-b02abe2-msvc2019-win64.7z + - C:\projects\openmw\deps\ffmpeg-4.2.2-dev-win64.zip + - C:\projects\openmw\deps\ffmpeg-4.2.2-win64.zip + - C:\projects\openmw\deps\OpenAL-Soft-1.20.1.zip + - C:\projects\openmw\deps\SDL2-2.0.18.zip clone_folder: C:\projects\openmw @@ -53,7 +46,6 @@ before_build: - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -c %configuration% -p %PLATFORM% -v %msvc% -V -i %APPVEYOR_BUILD_FOLDER%\install build_script: - - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32 - cmd: if %PLATFORM%==x64 set build=MSVC%msvc%_64 - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - cmd: cmake --install %build% --config %configuration% |