From f8304a52c489711a6ea97dc15966d0e51749dff6 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 17:04:52 +0200
Subject: [PATCH 1/8] Enable verbose logging for CI

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index d8f2bfc35..42aabab37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -52,7 +52,7 @@ install:
     - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM% -v %msvc%
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM% -v %msvc% -V
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=MSVC%msvc%_32

From ea6c73333b6cbd6745b0eeed6c543ffede34f4fb Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 17:14:32 +0200
Subject: [PATCH 2/8] Bumping Qt to 5.10 for Appveyor

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a0cf06919..9b564a180 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -568,7 +568,7 @@ echo
 if [ -z $APPVEYOR ]; then
 	printf "Qt 5.7.0... "
 else
-	printf "Qt 5.7 AppVeyor... "
+	printf "Qt 5.10 AppVeyor... "
 fi
 {
 	if [ $BITS -eq 64 ]; then
@@ -618,7 +618,7 @@ fi
 
 		echo Done.
 	else
-		QT_SDK="C:/Qt/5.7/msvc${MSVC_YEAR}${SUFFIX}"
+		QT_SDK="C:/Qt/5.10/msvc${MSVC_YEAR}${SUFFIX}"
 
 		add_cmake_opts -DDESIRED_QT_VERSION=5 \
 			-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \

From 12b201348a6cf1b2f6e668654fd54396181c6b15 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 17:17:04 +0200
Subject: [PATCH 3/8] Switch to the supported VS versions on Appveyor

---
 appveyor.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 42aabab37..bce288a57 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,12 +8,12 @@ branches:
 
 environment:
     matrix:
-        - msvc: 2013
         - msvc: 2015
+        - msvc: 2017
 
 platform:
-    - Win32
-#   - x64
+#   - Win32
+    - x64
 
 configuration:
     - Debug
@@ -27,16 +27,10 @@ os: Visual Studio 2015
 clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2013-win32.7z
-    - C:\projects\openmw\deps\Bullet-2.83.7-msvc2013-win64.7z
     - C:\projects\openmw\deps\Bullet-2.83.7-msvc2015-win32.7z
     - C:\projects\openmw\deps\Bullet-2.83.7-msvc2015-win64.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2013-win32.7z
-    - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2013-win32.7z
     - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2015-win64.7z
     - C:\projects\openmw\deps\MyGUI-3.2.3-git-msvc2015-win64.7z
-    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2013-win32.7z
-    - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2013-win32.7z
     - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2015-win64.7z
     - C:\projects\openmw\deps\OSG-3.4.0-scrawl-msvc2015-win64.7z
     - C:\projects\openmw\deps\ffmpeg-3.0.1-dev-win32.7z

From e1e7a4b11adeeb51e4d565b5050f87268535bdd1 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 18:04:59 +0200
Subject: [PATCH 4/8] Change Appveyor to use Visual Studio 2017

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index bce288a57..ca6a59585 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
 
 environment:
     matrix:
-        - msvc: 2015
+#       - msvc: 2015
         - msvc: 2017
 
 platform:
@@ -20,7 +20,7 @@ configuration:
 #   - Release
 
 # For the Qt, Boost, CMake, etc installs
-os: Visual Studio 2015
+os: Visual Studio 2017
 
 # We want the git revision for versioning,
 # so shallow clones don't work.

From bcfa2a13a6b3fa02f1691bf6fcf3dc6ed07bbc26 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 18:09:31 +0200
Subject: [PATCH 5/8] Use the VS2017 packaging of Qt5 for Appveyor

---
 CI/before_script.msvc.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 9b564a180..3b4b23027 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -385,7 +385,7 @@ else
 	if [ $MSVC_VER -eq 12 ]; then
 		printf "Boost 1.58.0 AppVeyor... "
 	else
-		printf "Boost 1.60.0 AppVeyor... "
+		printf "Boost 1.67.0 AppVeyor... "
 	fi
 fi
 {
@@ -411,7 +411,7 @@ fi
 		if [ $MSVC_VER -eq 12 ]; then
 			BOOST_SDK="c:/Libraries/boost_1_58_0"
 		else
-			BOOST_SDK="c:/Libraries/boost_1_60_0"
+			BOOST_SDK="c:/Libraries/boost_1_67_0"
 		fi
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
@@ -618,7 +618,7 @@ fi
 
 		echo Done.
 	else
-		QT_SDK="C:/Qt/5.10/msvc${MSVC_YEAR}${SUFFIX}"
+		QT_SDK="C:/Qt/5.10/msvc${MSVC_DISPLAY_YEAR}${SUFFIX}"
 
 		add_cmake_opts -DDESIRED_QT_VERSION=5 \
 			-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \

From 3bd8dc3ef6e4a178e715133c06ae562fc43ea9d4 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 18:22:02 +0200
Subject: [PATCH 6/8] Use the right boost version for Appveyor

---
 CI/before_script.msvc.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3b4b23027..a4a436b48 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -216,6 +216,7 @@ case $VS_VERSION in
 	15|15.0|2017 )
 		GENERATOR="Visual Studio 15 2017"
 		TOOLSET="vc140"
+		MSVC_REAL_VER="15"
 		MSVC_VER="14"
 		MSVC_YEAR="2015"
 		MSVC_DISPLAY_YEAR="2017"
@@ -224,6 +225,7 @@ case $VS_VERSION in
 	14|14.0|2015 )
 		GENERATOR="Visual Studio 14 2015"
 		TOOLSET="vc140"
+		MSVC_REAL_VER="14"
 		MSVC_VER="14"
 		MSVC_YEAR="2015"
 		MSVC_DISPLAY_YEAR="2015"
@@ -232,6 +234,7 @@ case $VS_VERSION in
 	12|12.0|2013 )
 		GENERATOR="Visual Studio 12 2013"
 		TOOLSET="vc120"
+		MSVC_REAL_VER="12"
 		MSVC_VER="12"
 		MSVC_YEAR="2013"
 		MSVC_DISPLAY_YEAR="2013"
@@ -408,13 +411,19 @@ fi
 		echo Done.
 	else
 		# Appveyor unstable has all the boost we need already
-		if [ $MSVC_VER -eq 12 ]; then
+		if [ $MSVC_REAL_VER -eq 12 ]; then
 			BOOST_SDK="c:/Libraries/boost_1_58_0"
 		else
 			BOOST_SDK="c:/Libraries/boost_1_67_0"
 		fi
+		if [ $MSVC_REAL_VER -eq 15 ]; then
+			LIB_SUFFIX="1"
+		else
+			LIB_SUFFIX="0"
+		fi
+		
 		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}.${LIB_SUFFIX}"
 		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
 
 		echo Done.

From 4f758bdd4800fd6323f51c683a65bab2cdd6f91f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 18:24:06 +0200
Subject: [PATCH 7/8] Use different environments for 2015 and 2017

---
 appveyor.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ca6a59585..eae4bd5b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,8 +8,10 @@ branches:
 
 environment:
     matrix:
-#       - msvc: 2015
+        - msvc: 2015
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
         - msvc: 2017
+          APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 platform:
 #   - Win32
@@ -20,7 +22,7 @@ configuration:
 #   - Release
 
 # For the Qt, Boost, CMake, etc installs
-os: Visual Studio 2017
+#os: Visual Studio 2017
 
 # We want the git revision for versioning,
 # so shallow clones don't work.

From d05de8e4114d28a7e10d8d4d0d7e679d4b643348 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ananace\" Olofsson" <ace@haxalot.com>
Date: Sun, 20 May 2018 18:51:28 +0200
Subject: [PATCH 8/8] Give boost the correct toolset for 2017

---
 CI/before_script.msvc.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a4a436b48..9c12c45db 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -216,6 +216,7 @@ case $VS_VERSION in
 	15|15.0|2017 )
 		GENERATOR="Visual Studio 15 2017"
 		TOOLSET="vc140"
+		TOOLSET_REAL="vc141"
 		MSVC_REAL_VER="15"
 		MSVC_VER="14"
 		MSVC_YEAR="2015"
@@ -225,6 +226,7 @@ case $VS_VERSION in
 	14|14.0|2015 )
 		GENERATOR="Visual Studio 14 2015"
 		TOOLSET="vc140"
+		TOOLSET_REAL="vc140"
 		MSVC_REAL_VER="14"
 		MSVC_VER="14"
 		MSVC_YEAR="2015"
@@ -234,6 +236,7 @@ case $VS_VERSION in
 	12|12.0|2013 )
 		GENERATOR="Visual Studio 12 2013"
 		TOOLSET="vc120"
+		TOOLSET_REAL="vc120"
 		MSVC_REAL_VER="12"
 		MSVC_VER="12"
 		MSVC_YEAR="2013"
@@ -424,7 +427,7 @@ fi
 		
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.${LIB_SUFFIX}"
-		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
+		add_cmake_opts -DBoost_COMPILER="-${TOOLSET_REAL}"
 
 		echo Done.
 	fi