From 1fdffd6ef9604403cc21c692ca5cfb89d638fa28 Mon Sep 17 00:00:00 2001
From: Bret Curtis <>
Date: Wed, 27 Jun 2018 13:57:51 +0200
Subject: [PATCH 01/51] see if we can get win10 going

---
 .gitlab-ci.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d815c7d77..ec3a9696c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,4 +43,21 @@ MacOS:
     - cd build; make -j2 package
   artifacts:
     paths:
-      - build/OpenMW-*.dmg
\ No newline at end of file
+      - build/OpenMW-*.dmg
+
+Win10:
+  tags:
+    - win10
+    - msvc2017
+  stage: build
+  allow_failure: true
+  script:
+    - rm -fr build/*  #  remove anything in the build directory
+    - CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
+    - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
+  cache:
+    paths:
+    - C:\projects\openmw\deps\*
+  artifacts:
+    paths:
+      - */OpenMW*.exe

From 51179a2c388229a5979190aeff6e26606568cd9d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:01:51 +0000
Subject: [PATCH 02/51] try a wildcard?

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec3a9696c..e4242e3f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,4 +60,4 @@ Win10:
     - C:\projects\openmw\deps\*
   artifacts:
     paths:
-      - */OpenMW*.exe
+    - "*/OpenMW*.exe"

From 6d1a83e667554f49d003f89ae011e473712e9be2 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:10:09 +0000
Subject: [PATCH 03/51] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4242e3f5..7aba228db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,6 +53,7 @@ Win10:
   allow_failure: true
   script:
     - rm -fr build/*  #  remove anything in the build directory
+    - cd $CI_PROJECT_DIR/openmw
     - CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:

From 0105a48a4f119db16c94c24bc982e1fd49952b7c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:15:29 +0000
Subject: [PATCH 04/51] give %% a try

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7aba228db..1dbbbab5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ Win10:
   allow_failure: true
   script:
     - rm -fr build/*  #  remove anything in the build directory
-    - cd $CI_PROJECT_DIR/openmw
+    - cd %CI_PROJECT_DIR%/openmw
     - CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:

From 218353e452c73d4f22a94732956da2c45e795f38 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:19:03 +0000
Subject: [PATCH 05/51] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dbbbab5f..742d663c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,10 @@ Win10:
   allow_failure: true
   script:
     - rm -fr build/*  #  remove anything in the build directory
-    - cd %CI_PROJECT_DIR%/openmw
+    - echo pwd
+    - echo $CI_PROJECT_DIR
+    - ls -al $CI_PROJECT_DIR
+    - cd $CI_PROJECT_DIR
     - CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:

From edd22342f23507997796ba725bbc157e6ebfeb94 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:32:18 +0000
Subject: [PATCH 06/51] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 742d663c0..c2c6a8e49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,12 +52,12 @@ Win10:
   stage: build
   allow_failure: true
   script:
-    - rm -fr build/*  #  remove anything in the build directory
-    - echo pwd
-    - echo $CI_PROJECT_DIR
-    - ls -al $CI_PROJECT_DIR
-    - cd $CI_PROJECT_DIR
-    - CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
+    - sh rm -fr build/*  #  remove anything in the build directory
+    - sh env
+    - sh pwd
+    - sh echo $CI_PROJECT_DIR
+    - sh echo %CI_PROJECT_DIR%
+    - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:
     paths:

From 2d5f71e5bea3c793d904dee1c7a8ff4f513e9023 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:35:02 +0000
Subject: [PATCH 07/51] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2c6a8e49..39fd1681e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ Win10:
   stage: build
   allow_failure: true
   script:
-    - sh rm -fr build/*  #  remove anything in the build directory
+    # - sh rm -fr build/*  #  remove anything in the build directory
     - sh env
     - sh pwd
     - sh echo $CI_PROJECT_DIR

From 6751a7991d02258c784dfd2f97c40270f4f380e0 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 12:36:12 +0000
Subject: [PATCH 08/51] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39fd1681e..5fa5cafc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,11 +52,11 @@ Win10:
   stage: build
   allow_failure: true
   script:
-    # - sh rm -fr build/*  #  remove anything in the build directory
-    - sh env
-    - sh pwd
-    - sh echo $CI_PROJECT_DIR
-    - sh echo %CI_PROJECT_DIR%
+    - rm -fr build/*  #  remove anything in the build directory
+    - env
+    - pwd
+    - echo $CI_PROJECT_DIR
+    - echo %CI_PROJECT_DIR%
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:

From da5d7afe22f3275907a15be51f5ab6622bc3c4fa Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 13:25:23 +0000
Subject: [PATCH 09/51] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fa5cafc9..acc3b880f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,14 +54,11 @@ Win10:
   script:
     - rm -fr build/*  #  remove anything in the build directory
     - env
-    - pwd
-    - echo $CI_PROJECT_DIR
-    - echo %CI_PROJECT_DIR%
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:
     paths:
-    - C:\projects\openmw\deps\*
+    - deps
   artifacts:
     paths:
     - "*/OpenMW*.exe"

From f7e1083ba4695a7bdf6c4442709e1def9a4272de Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 13:34:37 +0000
Subject: [PATCH 10/51] get more output from boost

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 38b304bf9..5b7483b14 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -421,7 +421,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+			# "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)"
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From b6fc204dd3bc796da3268ef58763c0864a247fbb Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 14:02:30 +0000
Subject: [PATCH 11/51] be more aggressive about suppressing message boxes

---
 .gitlab-ci.yml           | 4 ++--
 CI/before_script.msvc.sh | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acc3b880f..de5b0d3ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,6 @@ Win10:
   stage: build
   allow_failure: true
   script:
-    - rm -fr build/*  #  remove anything in the build directory
     - env
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
@@ -61,4 +60,5 @@ Win10:
     - deps
   artifacts:
     paths:
-    - "*/OpenMW*.exe"
+    - deps\boost_install.log
+    - "*\OpenMW*.exe"
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 5b7483b14..a88339fac 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -421,8 +421,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			# "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)"
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log" 
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 609d6a1b291433ff6601bdd2263275b10d99e99a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 14:05:05 +0000
Subject: [PATCH 12/51] bad syntax

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de5b0d3ac..1e34b5ae8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,4 +61,3 @@ Win10:
   artifacts:
     paths:
     - deps\boost_install.log
-    - "*\OpenMW*.exe"

From 59a4251a6ac9b9ae8d79284b7995b0f7096814c8 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 14:36:20 +0000
Subject: [PATCH 13/51] try to extract boost higher up in dir, then move.

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a88339fac..308104d05 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 MISSINGTOOLS=0
 
@@ -421,7 +422,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log" 
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="C:\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv /c/boost $BOOST_SDK
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From bd602847b58b603a944a9be4a271fa77bdc621cd Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 15:07:53 +0000
Subject: [PATCH 14/51] fix broken QT 5.7.0 link

---
 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 308104d05..ab2a1d39c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -366,8 +366,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
 			QT_SUFFIX=""
 		fi
 
-		download "Qt 5.7.2" \
-			"https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-windows-x86-msvc${MSVC_YEAR}${QT_SUFFIX}-5.7.0.exe" \
+		download "Qt 5.7.0" \
+			"https://download.qt.io/archive/qt/5.7/5.7.0/qt-opensource-windows-x86-msvc${MSVC_YEAR}${QT_SUFFIX}-5.7.0.exe" \
 			"qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" \
 			"https://www.lysator.liu.se/~ace/OpenMW/deps/qt-5-install.qs" \
 			"qt-5-install.qs"

From df23e0f857269b9d6e9512e0d772374d6c11d6ef Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 16:39:45 +0000
Subject: [PATCH 15/51] Try calling it directly

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e34b5ae8..f5ab1e4c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ Win10:
   script:
     - env
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
-    - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
+    - C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:
     paths:
     - deps

From 8511f2398ac029f97457415c335064c2cf5f840e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 16:53:27 +0000
Subject: [PATCH 16/51] try a set and call?

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5ab1e4c0..f43f29b5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,8 @@ Win10:
   script:
     - env
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
-    - C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
+    - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
+    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
   cache:
     paths:
     - deps

From f17426cbcd28a67f4f3bfd75dd4fa573e984906e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 20:24:08 +0000
Subject: [PATCH 17/51] give boost 1.67 a spin with msvc 14.1

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index ab2a1d39c..eaef17781 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -236,7 +236,7 @@ case $VS_VERSION in
 		TOOLSET="vc140"
 		TOOLSET_REAL="vc141"
 		MSVC_REAL_VER="15"
-		MSVC_VER="14"
+		MSVC_VER="14.1"
 		MSVC_YEAR="2015"
 		MSVC_DISPLAY_YEAR="2017"
 		;;
@@ -246,7 +246,7 @@ case $VS_VERSION in
 		TOOLSET="vc140"
 		TOOLSET_REAL="vc140"
 		MSVC_REAL_VER="14"
-		MSVC_VER="14"
+		MSVC_VER="14.0"
 		MSVC_YEAR="2015"
 		MSVC_DISPLAY_YEAR="2015"
 		;;
@@ -256,7 +256,7 @@ case $VS_VERSION in
 		TOOLSET="vc120"
 		TOOLSET_REAL="vc120"
 		MSVC_REAL_VER="12"
-		MSVC_VER="12"
+		MSVC_VER="12.0"
 		MSVC_YEAR="2013"
 		MSVC_DISPLAY_YEAR="2013"
 		;;
@@ -326,9 +326,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# Boost
 	if [ -z $APPVEYOR ]; then
-		download "Boost 1.61.0" \
-			"https://sourceforge.net/projects/boost/files/boost-binaries/1.61.0/boost_1_61_0-msvc-${MSVC_VER}.0-${BITS}.exe" \
-			"boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe"
+		download "Boost 1.67.0" \
+			"https://sourceforge.net/projects/boost/files/boost-binaries/1.67.0/boost_1_67_0-msvc-${MSVC_VER}-${BITS}.exe" \
+			"boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe"
 	fi
 
 	# Bullet
@@ -404,7 +404,7 @@ echo
 
 # Boost
 if [ -z $APPVEYOR ]; then
-	printf "Boost 1.61.0... "
+	printf "Boost 1.67.0... "
 else
 	if [ $MSVC_VER -eq 12 ]; then
 		printf "Boost 1.58.0 AppVeyor... "
@@ -427,7 +427,7 @@ fi
 		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}"
 		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
 
 		echo Done.

From 83e23ee6fdc3091bae27362ffe2553bee84d8963 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 27 Jun 2018 20:45:51 +0000
Subject: [PATCH 18/51] gather up artifacts and use all processors available

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f43f29b5e..a7af340b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,10 +55,10 @@ Win10:
     - env
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
-    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
+    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS% 
   cache:
     paths:
     - deps
   artifacts:
     paths:
-    - deps\boost_install.log
+    - MSVC2017_64

From 7cd0235feddcfe51f3b3b18e6fb7707c4b2f6d55 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 07:56:40 +0000
Subject: [PATCH 19/51] Try creating a zip and archiving it.

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7af340b0..49974c5fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,10 +55,11 @@ Win10:
     - env
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
-    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS% 
+    - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%
+    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\ -xr"!*.pdb"
   cache:
     paths:
     - deps
   artifacts:
     paths:
-    - MSVC2017_64
+    - *.zip

From a8adb9374b51fa84013fc06cd414b7d4b2d34551 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 08:24:34 +0000
Subject: [PATCH 20/51] use quotes

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49974c5fb..e30402f6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,4 +62,4 @@ Win10:
     - deps
   artifacts:
     paths:
-    - *.zip
+    - "*.zip"

From 2d70c94733c0e16283078c3c1a40a4022088afc4 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 09:05:39 +0000
Subject: [PATCH 21/51] gather up everything with 7zip

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e30402f6b..8bff1ad9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ Win10:
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
     - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%
-    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\ -xr"!*.pdb"
+    - 7z a OpenMW_MSVC2017_64_%CI_BUILD_REF_NAME%_%CI_BUILD_ID%.zip %CI_PROJECT_DIR%\MSVC2017_64\Release\
   cache:
     paths:
     - deps

From 45d77372a05f009355d927e0fd58983cb787dd98 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 10:41:12 +0000
Subject: [PATCH 22/51] with 260 char path fixed, this should work.

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index eaef17781..d895db5b8 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,8 +422,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="C:\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv /c/boost $BOOST_SDK
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 1061270ac09bbc6f260b4510814b79ab067aca4e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 11:05:10 +0000
Subject: [PATCH 23/51] Try using @TEMP@ instead of hard coding it.

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index d895db5b8..62f41e49c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,7 +422,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="@TEMP@\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv @TEMP@/boost $BOOST_SDK
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 7bf502dd02946c9cc5ec10d007a14ad8f56ac03c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 11:09:27 +0000
Subject: [PATCH 24/51] Bash it out!

---
 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 62f41e49c..b2e2144e4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,8 +422,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="@TEMP@\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv @TEMP@/boost $BOOST_SDK
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TEMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv ${TEMP}/boost ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 1c4363eaa649c8ea7d3840b5db1aaba1a0280816 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 11:22:54 +0000
Subject: [PATCH 25/51] Using SYSTEMDRIVE because TEMP apparently means
 something different in bash then to windows cmd.

---
 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 b2e2144e4..d6cb7323e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,8 +422,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TEMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv ${TEMP}/boost ${BOOST_SDK}
+			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "${SYSTEMDRIVE}\boost" ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 71314f0c3a9c4c365562ebee4b94b95571c2ef1a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 12:03:52 +0000
Subject: [PATCH 26/51] Use boost 1.67 instead of 1.61

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index d6cb7323e..a35a61228 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,7 +422,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
 			mv "${SYSTEMDRIVE}\boost" ${BOOST_SDK}
 		fi
 

From 60ec340fa355e37b29b7a12099b14711d438b47e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 12:18:01 +0000
Subject: [PATCH 27/51] remove toolset_real, use just toolset, do proper
 comparison

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a35a61228..5aea6e04c 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -233,8 +233,7 @@ fi
 case $VS_VERSION in
 	15|15.0|2017 )
 		GENERATOR="Visual Studio 15 2017"
-		TOOLSET="vc140"
-		TOOLSET_REAL="vc141"
+		TOOLSET="vc141"
 		MSVC_REAL_VER="15"
 		MSVC_VER="14.1"
 		MSVC_YEAR="2015"
@@ -244,7 +243,6 @@ 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.0"
 		MSVC_YEAR="2015"
@@ -254,7 +252,6 @@ 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.0"
 		MSVC_YEAR="2013"
@@ -406,7 +403,7 @@ echo
 if [ -z $APPVEYOR ]; then
 	printf "Boost 1.67.0... "
 else
-	if [ $MSVC_VER -eq 12 ]; then
+	if [ $MSVC_VER -eq 12.0 ]; then
 		printf "Boost 1.58.0 AppVeyor... "
 	else
 		printf "Boost 1.67.0 AppVeyor... "
@@ -446,7 +443,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_REAL}"
+		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
 
 		echo Done.
 	fi

From 4ad3d66629446e2b22356f4cd32aca6b08c62bcb Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 14:18:58 +0000
Subject: [PATCH 28/51] try using just ${TMP}

---
 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 5aea6e04c..2e96528a9 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,8 +419,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${SYSTEMDRIVE}\boost" ${BOOST_SDK}
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "${TMP}\boost" ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From fb6ad9faecaaa63ea4fc99f871273733bf1bb224 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 15:23:56 +0000
Subject: [PATCH 29/51] try %TMP% ?

---
 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 2e96528a9..e33eaa59f 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,8 +419,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${TMP}\boost" ${BOOST_SDK}
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="%TMP%\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "%TMP%\boost" ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From c4a4111b2ee8fc514e97c1454fcb7647916cae8a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 15:33:32 +0000
Subject: [PATCH 30/51] Update before_script.msvc.sh

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index e33eaa59f..f746cdbe1 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,7 +419,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="%TMP%\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
 			mv "%TMP%\boost" ${BOOST_SDK}
 		fi
 

From 3ceb9116dec7e9136c2574de6d2209c8724d1cb3 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 20:28:58 +0000
Subject: [PATCH 31/51] Give pwd -W a try

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index f746cdbe1..d76f29ffa 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,8 +419,9 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${TMP}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "%TMP%\boost" ${BOOST_SDK}
+			REAL_TEMP_PATH=`cd ${TMP} && pwd -W`
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${REAL_TEMP_PATH}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "${REAL_TEMP_PATH}\boost" ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 3379eafd33ae44688f34d33f03f5b75ccd68d81e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 28 Jun 2018 20:44:22 +0000
Subject: [PATCH 32/51] Update before_script.msvc.sh

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index d76f29ffa..874d89947 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -421,7 +421,7 @@ fi
 			rm -rf Boost
 			REAL_TEMP_PATH=`cd ${TMP} && pwd -W`
 			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${REAL_TEMP_PATH}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${REAL_TEMP_PATH}\boost" ${BOOST_SDK}
+			mv "${REAL_TEMP_PATH}/boost" ${BOOST_SDK}
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From 63bbc77ee77158f62b377a21cf430284877f343f Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 07:51:45 +0000
Subject: [PATCH 33/51] try using the powershell trick from AnyOldName3

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 874d89947..f2305c271 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -413,15 +413,19 @@ fi
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
 
+        # Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
+        # We work around this by installing to root of the current working drive and then move it to our deps
+        
 		BOOST_SDK="$(real_pwd)/Boost"
+		CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'`  # get the current working drive's root
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			REAL_TEMP_PATH=`cd ${TMP} && pwd -W`
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${REAL_TEMP_PATH}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${REAL_TEMP_PATH}/boost" ${BOOST_SDK}
+            "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}\Boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "${CWD_DRIVE_ROOT}\Boost" ${BOOST_SDK}
+
 		fi
 
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From bc830a9c45950ed4eef8c257c787b9ca8728dd5b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 08:00:54 +0000
Subject: [PATCH 34/51] use boost_temp

---
 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 f2305c271..3f31c4ddb 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -423,8 +423,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-            "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}\Boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${CWD_DRIVE_ROOT}\Boost" ${BOOST_SDK}
+            "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			mv "${CWD_DRIVE_ROOT}Boost_temp" ${BOOST_SDK}
 
 		fi
 

From bccd83c656763374232e9b30eea08bf5bf4e3d7b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 08:09:41 +0000
Subject: [PATCH 35/51] Use 1.67

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3f31c4ddb..15903c6ba 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -423,7 +423,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-            "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+            "${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
 			mv "${CWD_DRIVE_ROOT}Boost_temp" ${BOOST_SDK}
 
 		fi

From c2ff30c4d7331ee0bf68c6e7bf389c9ef39524e7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 09:33:51 +0000
Subject: [PATCH 36/51] correcting from GH/AV feedback, testing on GL.

---
 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 15903c6ba..17f97bc6b 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,12 +419,12 @@ fi
 		BOOST_SDK="$(real_pwd)/Boost"
 		CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'`  # get the current working drive's root
 
-		if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then
+		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
             "${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
-			mv "${CWD_DRIVE_ROOT}Boost_temp" ${BOOST_SDK}
+			mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
 
 		fi
 

From a6d6dd59958f837aa129a5be8704e7573f9f3614 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 13:17:19 +0000
Subject: [PATCH 37/51] updating for the nits

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 17f97bc6b..59771ad57 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+# set -x  # turn-on for debugging
 
 MISSINGTOOLS=0
 
@@ -77,7 +77,6 @@ while [ $# -gt 0 ]; do
 			h )
 				cat <<EOF
 Usage: $0 [-cdehkpuvV]
-
 Options:
 	-c <Release/Debug>
 		Set the configuration, can also be set with environment variable CONFIGURATION.
@@ -413,25 +412,23 @@ fi
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
 
-        # Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
-        # We work around this by installing to root of the current working drive and then move it to our deps
+		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
+		# We work around this by installing to root of the current working drive and then move it to our deps
         
 		BOOST_SDK="$(real_pwd)/Boost"
-		CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'`  # get the current working drive's root
+		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root')  # get the current working drive's root
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-            "${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"			
+			[ -n "$CI" ] CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG="boost_install.log"
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}	
 			mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
-
 		fi
-
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"
 		add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
-
 		echo Done.
 	else
 		# Appveyor unstable has all the boost we need already
@@ -449,18 +446,15 @@ 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}"
-
 		echo Done.
 	fi
 }
 cd $DEPS
 echo
-
 # Bullet
 printf "Bullet 2.86... "
 {
 	cd $DEPS_INSTALL
-
 	if [ -d Bullet ]; then
 		printf -- "Exists. (No version checking) "
 	elif [ -z $SKIP_EXTRACT ]; then
@@ -468,49 +462,38 @@ printf "Bullet 2.86... "
 		eval 7z x -y "${DEPS}/Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
 		mv "Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}" Bullet
 	fi
-
 	export BULLET_ROOT="$(real_pwd)/Bullet"
-
 	echo Done.
 }
 cd $DEPS
 echo
-
 # FFmpeg
 printf "FFmpeg 3.2.4... "
 {
 	cd $DEPS_INSTALL
-
 	if [ -d FFmpeg ] && grep "FFmpeg version: 3.2.4" FFmpeg/README.txt > /dev/null; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf FFmpeg
-
 		eval 7z x -y "${DEPS}/ffmpeg-3.2.4-win${BITS}.zip" $STRIP
 		eval 7z x -y "${DEPS}/ffmpeg-3.2.4-dev-win${BITS}.zip" $STRIP
-
 		mv "ffmpeg-3.2.4-win${BITS}-shared" FFmpeg
 		cp -r "ffmpeg-3.2.4-win${BITS}-dev/"* FFmpeg/
 		rm -rf "ffmpeg-3.2.4-win${BITS}-dev"
 	fi
-
 	export FFMPEG_HOME="$(real_pwd)/FFmpeg"
 	add_runtime_dlls "$(pwd)/FFmpeg/bin/"{avcodec-57,avformat-57,avutil-55,swresample-2,swscale-4}.dll
-
 	if [ $BITS -eq 32 ]; then
 		add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
 	fi
-
 	echo Done.
 }
 cd $DEPS
 echo
-
 # MyGUI
 printf "MyGUI 3.2.2... "
 {
 	cd $DEPS_INSTALL
-
 	if [ -d MyGUI ] && \
 		grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
 		grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
@@ -522,21 +505,17 @@ printf "MyGUI 3.2.2... "
 		eval 7z x -y "${DEPS}/MyGUI-3.2.2-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
 		mv "MyGUI-3.2.2-msvc${MSVC_YEAR}-win${BITS}" MyGUI
 	fi
-
 	export MYGUI_HOME="$(real_pwd)/MyGUI"
-
 	if [ $CONFIGURATION == "Debug" ]; then
 		SUFFIX="_d"
 	else
 		SUFFIX=""
 	fi
 	add_runtime_dlls "$(pwd)/MyGUI/bin/${CONFIGURATION}/MyGUIEngine${SUFFIX}.dll"
-
 	echo Done.
 }
 cd $DEPS
 echo
-
 # OpenAL
 printf "OpenAL-Soft 1.17.2... "
 {
@@ -546,24 +525,18 @@ printf "OpenAL-Soft 1.17.2... "
 		rm -rf openal-soft-1.17.2-bin
 		eval 7z x -y OpenAL-Soft-1.17.2.zip $STRIP
 	fi
-
 	OPENAL_SDK="$(real_pwd)/openal-soft-1.17.2-bin"
-
 	add_cmake_opts -DOPENAL_INCLUDE_DIR="${OPENAL_SDK}/include/AL" \
 		-DOPENAL_LIBRARY="${OPENAL_SDK}/libs/Win${BITS}/OpenAL32.lib"
-
 	add_runtime_dlls "$(pwd)/openal-soft-1.17.2-bin/bin/WIN${BITS}/soft_oal.dll:OpenAL32.dll"
-
 	echo Done.
 }
 cd $DEPS
 echo
-
 # OSG
 printf "OSG 3.4.1-scrawl... "
 {
 	cd $DEPS_INSTALL
-
 	if [ -d OSG ] && \
 		grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
 		grep "OPENSCENEGRAPH_MINOR_VERSION    4" OSG/include/osg/Version > /dev/null && \
@@ -575,28 +548,21 @@ printf "OSG 3.4.1-scrawl... "
 		eval 7z x -y "${DEPS}/OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
 		mv "OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}" OSG
 	fi
-
 	OSG_SDK="$(real_pwd)/OSG"
-
 	add_cmake_opts -DOSG_DIR="$OSG_SDK"
-
 	if [ $CONFIGURATION == "Debug" ]; then
 		SUFFIX="d"
 	else
 		SUFFIX=""
 	fi
-
 	add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng*}${SUFFIX}.dll \
 		"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer}${SUFFIX}.dll
-
 	add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_"{bmp,dds,jpeg,osg,png,tga}${SUFFIX}.dll
 	add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer}${SUFFIX}.dll
-
 	echo Done.
 }
 cd $DEPS
 echo
-
 # Qt
 if [ -z $APPVEYOR ]; then
 	printf "Qt 5.7.0... "
@@ -609,71 +575,53 @@ fi
 	else
 		SUFFIX=""
 	fi
-
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
 		QT_SDK="$(real_pwd)/Qt/5.7/msvc${MSVC_YEAR}${SUFFIX}"
-
 		if [ -d Qt ] && head -n2 Qt/InstallationLog.txt | grep "5.7.0" > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Qt
 			cp "${DEPS}/qt-5-install.qs" qt-install.qs
-
-
 			sed -i "s|INSTALL_DIR|$(real_pwd)/Qt|" qt-install.qs
 			sed -i "s/qt.VERSION.winBITS_msvcYEAR/qt.57.win${BITS}_msvc${MSVC_YEAR}${SUFFIX}/" qt-install.qs
-
 			printf -- "(Installation might take a while) "
 			"${DEPS}/qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" --script qt-install.qs --silent
-
 			mv qt-install.qs Qt/
-
 			echo Done.
 			printf "  Cleaning up extraneous data... "
 			rm -r "$(real_pwd)/Qt/"{dist,Docs,Examples,Tools,vcredist,components.xml,MaintenanceTool.dat,MaintenanceTool.exe,MaintenanceTool.ini,network.xml,qt-install.qs}
 		fi
-
 		cd $QT_SDK
-
 		add_cmake_opts -DDESIRED_QT_VERSION=5 \
 			-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
-
 		if [ $CONFIGURATION == "Debug" ]; then
 			SUFFIX="d"
 		else
 			SUFFIX=""
 		fi
-
 		add_runtime_dlls "$(pwd)/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
 		add_qt_platform_dlls "$(pwd)/plugins/platforms/qwindows${SUFFIX}.dll"
-
 		echo Done.
 	else
 		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" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
-
 		if [ $CONFIGURATION == "Debug" ]; then
 			SUFFIX="d"
 		else
 			SUFFIX=""
 		fi
-
 		DIR=$(echo "${QT_SDK}" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
-
 		add_runtime_dlls "${DIR}/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
 		add_qt_platform_dlls "${DIR}/plugins/platforms/qwindows${SUFFIX}.dll"
-
 		echo Done.
 	fi
 }
 cd $DEPS
 echo
-
 # SDL2
 printf "SDL 2.0.7... "
 {
@@ -683,26 +631,18 @@ printf "SDL 2.0.7... "
 		rm -rf SDL2-2.0.7
 		eval 7z x -y SDL2-2.0.7.zip $STRIP
 	fi
-
 	export SDL2DIR="$(real_pwd)/SDL2-2.0.7"
-
 	add_runtime_dlls "$(pwd)/SDL2-2.0.7/lib/x${ARCHSUFFIX}/SDL2.dll"
-
 	echo Done.
 }
 echo
-
-
 cd $DEPS_INSTALL/..
-
 echo
 echo "Setting up OpenMW build..."
-
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
 	-DBUILD_MYGUI_PLUGIN=no \
 	-DOPENMW_MP_BUILD=on
-
 if [ ! -z $CI ]; then
 	case $STEP in
 		components )
@@ -714,7 +654,6 @@ if [ ! -z $CI ]; then
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
 			;;
-
 		openmw )
 			echo "  Building subproject: OpenMW."
 			add_cmake_opts -DBUILD_ESSIMPORTER=no \
@@ -723,7 +662,6 @@ if [ ! -z $CI ]; then
 				-DBUILD_OPENCS=no \
 				-DBUILD_WIZARD=no
 			;;
-
 		opencs )
 			echo "  Building subproject: OpenCS."
 			add_cmake_opts -DBUILD_ESSIMPORTER=no \
@@ -732,7 +670,6 @@ if [ ! -z $CI ]; then
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
 			;;
-
 		misc )
 			echo "  Building subprojects: Misc."
 			add_cmake_opts -DBUILD_OPENCS=no \
@@ -740,7 +677,6 @@ if [ ! -z $CI ]; then
 			;;
 	esac
 fi
-
 # NOTE: Disable this when/if we want to run test cases
 #if [ -z $CI ]; then
 	echo "- Copying Runtime DLLs..."
@@ -749,16 +685,13 @@ fi
 		TARGET="$(basename "$DLL")"
 		if [[ "$DLL" == *":"* ]]; then
 			IFS=':'; SPLIT=( ${DLL} ); unset IFS
-
 			DLL=${SPLIT[0]}
 			TARGET=${SPLIT[1]}
 		fi
-
 		echo "    ${TARGET}."
 		cp "$DLL" "$BUILD_CONFIG/$TARGET"
 	done
 	echo
-
 	echo "- OSG Plugin DLLs..."
 	mkdir -p $BUILD_CONFIG/osgPlugins-3.4.1
 	for DLL in $OSG_PLUGINS; do
@@ -766,7 +699,6 @@ fi
 		cp "$DLL" $BUILD_CONFIG/osgPlugins-3.4.1
 	done
 	echo
-
 	echo "- Qt Platform DLLs..."
 	mkdir -p ${BUILD_CONFIG}/platforms
 	for DLL in $QT_PLATFORMS; do
@@ -775,16 +707,13 @@ fi
 	done
 	echo
 #fi
-
 if [ -z $VERBOSE ]; then
 	printf -- "- Configuring... "
 else
 	echo "- cmake .. $CMAKE_OPTS"
 fi
-
 run_cmd cmake .. $CMAKE_OPTS
 RET=$?
-
 if [ -z $VERBOSE ]; then
 	if [ $RET -eq 0 ]; then
 		echo Done.
@@ -792,5 +721,4 @@ if [ -z $VERBOSE ]; then
 		echo Failed.
 	fi
 fi
-
 exit $RET

From dc48a46e50380d1f4762c792075b49283618690b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 13:22:07 +0000
Subject: [PATCH 38/51] Update before_script.msvc.sh

---
 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 59771ad57..5f2b8a520 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,8 +422,8 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			[ -n "$CI" ] CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG="boost_install.log"
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}	
+			[ -n "$CI" ] CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
 			mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
 		fi
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \

From ca0f6fff4a12a4115cf43b662a879cc205a8b29d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 13:25:36 +0000
Subject: [PATCH 39/51] Update before_script.msvc.sh

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 5f2b8a520..4a7162fdf 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -422,7 +422,7 @@ fi
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
-			[ -n "$CI" ] CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
+			[ -n "$CI" ] && CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
 			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
 			mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
 		fi

From 06216aa1240598ec063d384f2e31936eb3c6bfbc Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 13:36:00 +0000
Subject: [PATCH 40/51] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bff1ad9c..6aa0773eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ Win10:
   stage: build
   allow_failure: true
   script:
-    - env
+    # - env  # turn on for debugging
     - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
     - SET msBuildLocation="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
     - call %msBuildLocation% MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:%NUMBER_OF_PROCESSORS%

From d3dfe17441cba6db43b0bdc6eee3b05c5ba3a05c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 15:13:06 +0000
Subject: [PATCH 41/51] try limiting scope

---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6aa0773eb..25d9a876d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,8 @@ MacOS:
   tags:
     - macos
     - xcode
+  except:
+    - branches
   stage: build
   allow_failure: true
   script:
@@ -45,10 +47,12 @@ MacOS:
     paths:
       - build/OpenMW-*.dmg
 
-Win10:
+Windows:
   tags:
     - win10
     - msvc2017
+  only:
+    - branches
   stage: build
   allow_failure: true
   script:

From 9b6ea0e89f15c9b64123b83ba8ec8b8d400f207d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 15:15:29 +0000
Subject: [PATCH 42/51] # because our CI VMs are not public, MRs can't use them
 and timeout

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25d9a876d..565feff14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ MacOS:
     - macos
     - xcode
   except:
-    - branches
+    - branches # because our CI VMs are not public, MRs can't use them and timeout
   stage: build
   allow_failure: true
   script:
@@ -51,8 +51,8 @@ Windows:
   tags:
     - win10
     - msvc2017
-  only:
-    - branches
+  except:
+    - branches # because our CI VMs are not public, MRs can't use them and timeout
   stage: build
   allow_failure: true
   script:

From 78a3f95ee4133f2f7f1d48f5aca26c66bbe221ba Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 18:03:25 +0000
Subject: [PATCH 43/51] Update before_script.msvc.sh

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 4a7162fdf..3f6c4d307 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -416,7 +416,7 @@ fi
 		# We work around this by installing to root of the current working drive and then move it to our deps
         
 		BOOST_SDK="$(real_pwd)/Boost"
-		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root')  # get the current working drive's root
+		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')"  # get the current working drive's root
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "

From 209359bbc355510ee2f096c510f340eb008882f9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 19:07:39 +0000
Subject: [PATCH 44/51] Try this on for size...

---
 .gitlab-ci.yml           | 4 ++--
 CI/before_script.msvc.sh | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 565feff14..1898c6c3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,8 @@ Windows:
   tags:
     - win10
     - msvc2017
-  except:
-    - branches # because our CI VMs are not public, MRs can't use them and timeout
+#  except:
+#    - branches # because our CI VMs are not public, MRs can't use them and timeout
   stage: build
   allow_failure: true
   script:
diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3f6c4d307..be2a58aa6 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -412,11 +412,13 @@ fi
 	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
 
+		BOOST_SDK="$(real_pwd)/Boost"
+
 		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
 		# We work around this by installing to root of the current working drive and then move it to our deps
-        
-		BOOST_SDK="$(real_pwd)/Boost"
-		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')"  # get the current working drive's root
+		# get the current working drive's root, we'll install to that temporarily
+		CWD_DRIVE_ROOT=$(echo "$(powershell -command '(get-location).Drive.Root')" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,") 
+		
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "

From b8b07b52f0a8593a818e94b110ffefd907d97258 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 29 Jun 2018 22:42:12 +0000
Subject: [PATCH 45/51] try this...

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index be2a58aa6..b85196079 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -417,7 +417,7 @@ fi
 		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
 		# We work around this by installing to root of the current working drive and then move it to our deps
 		# get the current working drive's root, we'll install to that temporarily
-		CWD_DRIVE_ROOT=$(echo "$(powershell -command '(get-location).Drive.Root')" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,") 
+		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root' | sed "s,\\\\,/,g")
 		
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then

From 4d60fe5a76c8bd238e7ecfe4848445fa8b99eb17 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 30 Jun 2018 06:10:26 +0000
Subject: [PATCH 46/51] reverting back

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index b85196079..78ec4fa94 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -417,7 +417,7 @@ fi
 		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
 		# We work around this by installing to root of the current working drive and then move it to our deps
 		# get the current working drive's root, we'll install to that temporarily
-		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root' | sed "s,\\\\,/,g")
+		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root')
 		
 
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then

From d4c9586bd0cc926ac3bc63e38560b43ddfbbd68d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 3 Jul 2018 12:53:30 +0000
Subject: [PATCH 47/51] try just converting the \ to a /

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 78ec4fa94..74d2df5a2 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -417,9 +417,8 @@ fi
 		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
 		# We work around this by installing to root of the current working drive and then move it to our deps
 		# get the current working drive's root, we'll install to that temporarily
-		CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root')
+		CWD_DRIVE_ROOT=$(echo "$(powershell -command '(get-location).Drive.Root')" | sed "s,\\\\,/,g") 
 		
-
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then

From 4f07ca28a64c91400aa7c9cd4f44de34a91b8dde Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 3 Jul 2018 13:00:19 +0000
Subject: [PATCH 48/51] Try passing the _real_ windows dir to innoinstaller,
 then using the linux-like directory for mv.

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 74d2df5a2..792053ad4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -417,15 +417,16 @@ fi
 		# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
 		# We work around this by installing to root of the current working drive and then move it to our deps
 		# get the current working drive's root, we'll install to that temporarily
-		CWD_DRIVE_ROOT=$(echo "$(powershell -command '(get-location).Drive.Root')" | sed "s,\\\\,/,g") 
+		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
+		CWD_DRIVE_ROOT_BASH=$(echo "$CWD_DRIVE_ROOT" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
 		
 		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost
 			[ -n "$CI" ] && CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
-			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
-			mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
+			"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
+			mv "${CWD_DRIVE_ROOT_BASH}" "${BOOST_SDK}"
 		fi
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"

From 11030e56c4aac0b6e6b65e28b3565be60fd2dda4 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 3 Jul 2018 13:41:06 +0000
Subject: [PATCH 49/51] detect existing dir

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

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 792053ad4..3ffca88de 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,8 +419,12 @@ fi
 		# get the current working drive's root, we'll install to that temporarily
 		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
 		CWD_DRIVE_ROOT_BASH=$(echo "$CWD_DRIVE_ROOT" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
-		
-		if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
+		if [ -d CWD_DRIVE_ROOT_BASH ] then
+			printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. "
+			exit 1
+		fi
+
+		if [ -d ${BOOST_SDK} ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
 			printf "Exists. "
 		elif [ -z $SKIP_EXTRACT ]; then
 			rm -rf Boost

From 70e9d5c0a099529bc93137339b02d6b148408281 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 3 Jul 2018 13:53:13 +0000
Subject: [PATCH 50/51] ; it?

---
 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 3ffca88de..56a9d92d9 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -419,9 +419,9 @@ fi
 		# get the current working drive's root, we'll install to that temporarily
 		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
 		CWD_DRIVE_ROOT_BASH=$(echo "$CWD_DRIVE_ROOT" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
-		if [ -d CWD_DRIVE_ROOT_BASH ] then
-			printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. "
-			exit 1
+		if [ -d CWD_DRIVE_ROOT_BASH ]; then
+			printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. ";
+			exit 1;
 		fi
 
 		if [ -d ${BOOST_SDK} ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then

From d4d46fc60256177968c96e9653ced2f83652338e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 4 Jul 2018 16:51:57 +0000
Subject: [PATCH 51/51] Build everything but branches until we can allow VM/CIs
 to run on forked projects.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1898c6c3c..565feff14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,8 @@ Windows:
   tags:
     - win10
     - msvc2017
-#  except:
-#    - branches # because our CI VMs are not public, MRs can't use them and timeout
+  except:
+    - branches # because our CI VMs are not public, MRs can't use them and timeout
   stage: build
   allow_failure: true
   script: