From 331d87d738f7a23c577b7955a7a72c13e8a9554f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 25 Jun 2015 19:19:04 +0200
Subject: [PATCH] Bring over some more OSG changes to the Appveyor scripts, and
 properly use Qt

---
 CI/before_script.msvc.sh | 13 +++++++------
 appveyor.yml             | 27 +++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2652e9898..06b14f2fe 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -52,8 +52,9 @@ run_cmd() {
 			if [ -z $APPVEYOR ]; then
 				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
 			else
-				appveyor AddMessage "Command $CMD failed." -Category Error -Details "$CMD $@"
-				while read in; do appveyor AddMessage "$in" -Category Error; done < output.log
+				echo
+				echo "Command $CMD failed;"
+				cat output.log
 			fi
 		else
 			rm output.log
@@ -451,7 +452,8 @@ if [ -z $APPVEYOR ]; then
 	cd $QT_SDK
 	eval qtbinpatcher.exe $STRIP
 
-	add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+	add_cmake_opts -DDESIRED_QT_VERSION=4 \
+		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 
 	if [ $CONFIGURATION == "Debug" ]; then
 		SUFFIX="d4"
@@ -471,7 +473,7 @@ else
 		QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
 	fi
 
-	add_cmake_opts -DDESIRED_QT_VERSION=4 \
+	add_cmake_opts -DDESIRED_QT_VERSION=5 \
 		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 fi
 
@@ -505,8 +507,7 @@ echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
-	-DBUILD_MYGUI_PLUGIN=no \
-	-DOPENMW_MP_BUILD=yes
+	-DBUILD_MYGUI_PLUGIN=no
 
 if [ -z $APPVEYOR ]; then
 	echo "  (Outside of AppVeyor, doing full build.)"
diff --git a/appveyor.yml b/appveyor.yml
index e46dd3dd8..a71df2155 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,28 +6,25 @@ platform:
 
 configuration:
     - Debug
-    - Release
+
+environment:
+    matrix:
+    - STEP: openmw
+    - STEP: opencs
+    - STEP: misc
 
 matrix:
     fast_finish: true
 
 os: unstable
 
-clone_depth: 5
+clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\OpenAL-Soft-1.16.0.zip -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\SDL2-2.0.3.zip -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z
+    - C:\projects\openmw\deps\ffmpeg32-2.5.2-dev.7z
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z
 
 init:
     - cmd: bash --version
@@ -42,3 +39,5 @@ build_script:
 
 before_build:
     - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
+
+test: off