From 2d7689b978444eef07f8a893b78da2d9cb1214fc Mon Sep 17 00:00:00 2001 From: PlutonicOverkill Date: Fri, 14 Jul 2017 12:07:16 +1200 Subject: [PATCH 1/4] Add Visual Studio 2017 support The new VS2017 configuration uses all the same settings as the VS2015 one, but uses a different generator. CMake by default looks for Boost libraries based on the compiler being used, but Boost only has binaries for VS2015, so a hack is used to make sure it looks for the correct ones. I don't know what TOOLSET and XP_TOOLSET are for but I left them just in case. --- CI/before_script.msvc.sh | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 5aa76de92..35cb2f818 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -75,7 +75,7 @@ Options: Set the build platform, can also be set with environment variable PLATFORM. -u Configure for unity builds. - -v <2013/2015> + -v <2013/2015/2017> Choose the Visual Studio version to use. -V Run verbosely @@ -213,20 +213,34 @@ if [ -z $VS_VERSION ]; then fi case $VS_VERSION in + 15|15.0|2017 ) + GENERATOR="Visual Studio 15 2017" + XP_TOOLSET="v140xp" + TOOLSET="v140" + BOOST_TOOLSET="vc140" + MSVC_VER="14" + MSVC_YEAR="2015" + MSVC_DISPLAY_YEAR="2017" + ;; + 14|14.0|2015 ) GENERATOR="Visual Studio 14 2015" XP_TOOLSET="v140_xp" TOOLSET="v140" + BOOST_TOOLSET="vc140" MSVC_VER="14" MSVC_YEAR="2015" + MSVC_DISPLAY_YEAR="2015" ;; 12|12.0|2013 ) GENERATOR="Visual Studio 12 2013" XP_TOOLSET="v120_xp" TOOLSET="v120" + BOOST_TOOLSET="vc120" MSVC_VER="12" MSVC_YEAR="2013" + MSVC_DISPLAY_YEAR="2013" ;; esac @@ -278,7 +292,7 @@ fi echo echo "===================================" -echo "Starting prebuild on MSVC${MSVC_YEAR} WIN${BITS}" +echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}" echo "===================================" echo @@ -350,7 +364,7 @@ fi cd .. #/.. # Set up dependencies -BUILD_DIR="MSVC${MSVC_YEAR}_${BITS}" +BUILD_DIR="MSVC${MSVC_DISPLAY_YEAR}_${BITS}" if [ -z $KEEP ]; then echo echo "(Re)Creating build directory." @@ -395,6 +409,7 @@ fi add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" + add_cmake_opts -DBoost_COMPILER="-${BOOST_TOOLSET}" echo Done. else @@ -406,6 +421,7 @@ fi fi add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" + add_cmake_opts -DBoost_COMPILER="-${BOOST_TOOLSET}" echo Done. fi From 0eb54fa96a5281a770f0f96cf6b6f99871ae4936 Mon Sep 17 00:00:00 2001 From: PlutonicOverkill Date: Sat, 22 Jul 2017 17:58:04 +1200 Subject: [PATCH 2/4] Remove TOOLSET and XP_TOOLSET --- CI/before_script.msvc.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 35cb2f818..14998a3c6 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -215,9 +215,7 @@ fi case $VS_VERSION in 15|15.0|2017 ) GENERATOR="Visual Studio 15 2017" - XP_TOOLSET="v140xp" - TOOLSET="v140" - BOOST_TOOLSET="vc140" + TOOLSET="vc140" MSVC_VER="14" MSVC_YEAR="2015" MSVC_DISPLAY_YEAR="2017" @@ -225,9 +223,7 @@ case $VS_VERSION in 14|14.0|2015 ) GENERATOR="Visual Studio 14 2015" - XP_TOOLSET="v140_xp" - TOOLSET="v140" - BOOST_TOOLSET="vc140" + TOOLSET="vc140" MSVC_VER="14" MSVC_YEAR="2015" MSVC_DISPLAY_YEAR="2015" @@ -235,9 +231,7 @@ case $VS_VERSION in 12|12.0|2013 ) GENERATOR="Visual Studio 12 2013" - XP_TOOLSET="v120_xp" - TOOLSET="v120" - BOOST_TOOLSET="vc120" + TOOLSET="vc120" MSVC_VER="12" MSVC_YEAR="2013" MSVC_DISPLAY_YEAR="2013" @@ -409,7 +403,7 @@ fi add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" - add_cmake_opts -DBoost_COMPILER="-${BOOST_TOOLSET}" + add_cmake_opts -DBoost_COMPILER="-${TOOLSET}" echo Done. else @@ -421,7 +415,7 @@ fi fi add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ -DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0" - add_cmake_opts -DBoost_COMPILER="-${BOOST_TOOLSET}" + add_cmake_opts -DBoost_COMPILER="-${TOOLSET}" echo Done. fi From 9924e4a35b170c85384547e1d999a793277524dc Mon Sep 17 00:00:00 2001 From: PlutonicOverkill Date: Mon, 24 Jul 2017 17:49:39 +1200 Subject: [PATCH 3/4] Stop VS2017 spamming warnings Disable warning caused by the string and stream-related standard headers. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea3dde08..56b42ed5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -626,6 +626,7 @@ if (WIN32) 4510 4512 # Unable to generate copy constructor/assignment operator as it's not public in the base 4706 # Assignment in conditional expression 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 4987 # nonstandard extension used (triggered by setjmp.h) 4996 # Function was declared deprecated From 8ded95201dc07bc471358f304740819e60cd1f4e Mon Sep 17 00:00:00 2001 From: Thunderforge Date: Mon, 24 Jul 2017 22:56:58 -0500 Subject: [PATCH 4/4] Move Morrowind Content Language label to section header --- files/ui/settingspage.ui | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/files/ui/settingspage.ui b/files/ui/settingspage.ui index 7f5e4a7de..bc2abdf2f 100644 --- a/files/ui/settingspage.ui +++ b/files/ui/settingspage.ui @@ -17,20 +17,10 @@ - General + Morrowind Content Language - - - <html><head/><body><p>The language of the original Morrowind installation files (used for the character encoding)</p></body></html> - - - Morrowind content language: - - - - @@ -40,6 +30,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + +