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

add msvc2019 and ditch msvc2015

Browse source
This commit is contained in:
Bret Curtis 2019-10-21 14:28:12 +02:00
parent 675a79d0dc
commit 4c94fcd52b
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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"

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