mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-18 09:06:45 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2567 from OpenMW/turn_on_msvc2019

Browse source 
add msvc2019 and ditch msvc2015
This commit is contained in:
Bret Curtis 2019-10-21 21:32:01 +02:00 committed by GitHub
commit c9c7732fc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CI/before_script.msvc.sh
View file

@ -247,7 +247,7 @@ if [ -z $CONFIGURATION ]; then
fi fi
if [ -z $VS_VERSION ]; then if [ -z $VS_VERSION ]; then
VS_VERSION="2013" VS_VERSION="2017"
fi fi
case $VS_VERSION in case $VS_VERSION in
@ -507,10 +507,10 @@ fi
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}" add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
echo Done. echo Done.
else else
# Appveyor unstable has all the boost we need already # Appveyor has all the boost we need already
BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}" BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}"
if [ $MSVC_REAL_VER -eq 15 ]; then if [ $MSVC_REAL_VER -ge 15 ]; then
LIB_SUFFIX="1" LIB_SUFFIX="1"
else else
LIB_SUFFIX="0" LIB_SUFFIX="0"
@ -641,7 +641,7 @@ echo
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
printf "Qt 5.7.0... " printf "Qt 5.7.0... "
else else
printf "Qt 5.10 AppVeyor... " printf "Qt 5.13 AppVeyor... "
fi fi
{ {
if [ $BITS -eq 64 ]; then if [ $BITS -eq 64 ]; then
@ -679,7 +679,7 @@ fi
add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll" add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
echo Done. echo Done.
else else
QT_SDK="C:/Qt/5.10/msvc${MSVC_DISPLAY_YEAR}${SUFFIX}" QT_SDK="C:/Qt/5.13/msvc2017${SUFFIX}"
add_cmake_opts -DDESIRED_QT_VERSION=5 \ add_cmake_opts -DDESIRED_QT_VERSION=5 \
-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \ -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
-DCMAKE_PREFIX_PATH="$QT_SDK" -DCMAKE_PREFIX_PATH="$QT_SDK"

7
appveyor.yml
View file

@ -8,13 +8,10 @@ branches:
environment: environment:
matrix: matrix:
- msvc: 2015
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- msvc: 2017 - msvc: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
matrix: - msvc: 2019
allow_failures: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- msvc: 2015
platform: platform:
# - Win32 # - Win32