teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1339 from PlutonicOverkill/vs2017-support

Browse source 
Add Visual Studio 2017 support (Feature #3952)
This commit is contained in:
scrawl 2017-07-25 21:07:34 +00:00 committed by GitHub
commit c23b75ab9a
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
CI/before_script.msvc.sh
View file

@ -75,7 +75,7 @@ Options:
Set the build platform, can also be set with environment variable PLATFORM. Set the build platform, can also be set with environment variable PLATFORM.
-u -u
Configure for unity builds. Configure for unity builds.
-v <2013/2015> -v <2013/2015/2017>
Choose the Visual Studio version to use. Choose the Visual Studio version to use.
-V -V
Run verbosely Run verbosely
@ -213,20 +213,28 @@ if [ -z $VS_VERSION ]; then
fi fi
case $VS_VERSION in case $VS_VERSION in
14|14.0|2015 ) 15|15.0|2017 )
GENERATOR="Visual Studio 14 2015" GENERATOR="Visual Studio 15 2017"
XP_TOOLSET="v140_xp" TOOLSET="vc140"
TOOLSET="v140"
MSVC_VER="14" MSVC_VER="14"
MSVC_YEAR="2015" MSVC_YEAR="2015"
MSVC_DISPLAY_YEAR="2017"
;;
14|14.0|2015 )
GENERATOR="Visual Studio 14 2015"
TOOLSET="vc140"
MSVC_VER="14"
MSVC_YEAR="2015"
MSVC_DISPLAY_YEAR="2015"
;; ;;
12|12.0|2013 ) 12|12.0|2013 )
GENERATOR="Visual Studio 12 2013" GENERATOR="Visual Studio 12 2013"
XP_TOOLSET="v120_xp" TOOLSET="vc120"
TOOLSET="v120"
MSVC_VER="12" MSVC_VER="12"
MSVC_YEAR="2013" MSVC_YEAR="2013"
MSVC_DISPLAY_YEAR="2013"
;; ;;
esac esac
@ -278,7 +286,7 @@ fi
echo echo
echo "===================================" echo "==================================="
echo "Starting prebuild on MSVC${MSVC_YEAR} WIN${BITS}" echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
echo "===================================" echo "==================================="
echo echo
@ -350,7 +358,7 @@ fi
cd .. #/.. cd .. #/..
# Set up dependencies # Set up dependencies
BUILD_DIR="MSVC${MSVC_YEAR}_${BITS}" BUILD_DIR="MSVC${MSVC_DISPLAY_YEAR}_${BITS}"
if [ -z $KEEP ]; then if [ -z $KEEP ]; then
echo echo
echo "(Re)Creating build directory." echo "(Re)Creating build directory."
@ -395,6 +403,7 @@ fi
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
echo Done. echo Done.
else else
@ -406,6 +415,7 @@ fi
fi fi
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
echo Done. echo Done.
fi fi

1
CMakeLists.txt
View file

@ -626,6 +626,7 @@ if (WIN32)
4510 4512 # Unable to generate copy constructor/assignment operator as it's not public in the base 4510 4512 # Unable to generate copy constructor/assignment operator as it's not public in the base
4706 # Assignment in conditional expression 4706 # Assignment in conditional expression
4738 # Storing 32-bit float result in memory, possible loss of performance 4738 # Storing 32-bit float result in memory, possible loss of performance
4774 # Format string expected in argument is not a string literal
4986 # Undocumented warning that occurs in the crtdbg.h file 4986 # Undocumented warning that occurs in the crtdbg.h file
4987 # nonstandard extension used (triggered by setjmp.h) 4987 # nonstandard extension used (triggered by setjmp.h)
4996 # Function was declared deprecated 4996 # Function was declared deprecated