From a831e89a43cc72c1bd8ffefb7570a7c73be45c38 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 7 Jul 2015 16:21:56 +0200
Subject: [PATCH] Fix MyGUI include dir, and properly return error codes

---
 CI/before_script.msvc.sh | 3 +--
 CI/build.msvc.sh         | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 6543df4d3..0d72806fb 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -372,8 +372,7 @@ fi
 MYGUI_SDK="`real_pwd`/MyGUI"
 
 add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
-	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
+	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
 	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
 if [ $CONFIGURATION == "Debug" ]; then
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index d426ef90d..731c51eda 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -50,6 +50,10 @@ else
 	msbuild OpenMW.sln //t:Build //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 fi
 
-if [ ! -z $PACKAGE ]; then
+RET=$?
+if [ $RET -eq 0 ] && [ ! -z $PACKAGE ]; then
 	msbuild PACKAGE.vcxproj //t:Build //m:8
-fi
\ No newline at end of file
+	RET=$?
+fi
+
+exit $RET