Merge branch 'appveyor' of github.com:ace13/openmw into appveyor

CI/before_script.msvc.sh

@@ -157,7 +157,6 @@ case $PLATFORM in
 		;;
 esac
 
-
 case $CONFIGURATION in
 	debug|Debug|DEBUG )
 		CONFIGURATION=Debug
@@ -178,6 +177,7 @@ echo "Starting prebuild on win$BITS"
 echo "=========================="
 echo
 
+# cd OpenMW/AppVeyor-test
 mkdir -p deps
 cd deps
 
@@ -216,17 +216,15 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip \
 		OpenAL-Soft-1.16.0.zip
 
-	# Ogre
-	download "Ogre 1.9" \
-		http://www.lysator.liu.se/~ace/OpenMW/deps/Ogre-1.9-win$BITS.7z \
-		Ogre-1.9-win$BITS.7z
+	# OSG
+	download "OpenSceneGraph 3.3.8" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.3.8-win$BITS.7z \
+		OSG-3.3.8-win$BITS.7z
 
 	# Qt
-	if [ -z $APPVEYOR ]; then
-		download "Qt 4.8.6" \
-			http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
-			qt$BITS-4.8.6.7z
-	fi
+	download "Qt 4.8.6" \
+		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+		qt$BITS-4.8.6.7z
 
 	# SDL2
 	download "SDL 2.0.3" \
@@ -234,7 +232,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		SDL2-2.0.3.zip
 fi
 
-cd ..
+cd .. #/..
 
 # Set up dependencies
 if [ -z $KEEP ]; then
@@ -254,6 +252,7 @@ DEPS_INSTALL=`pwd`
 echo
 echo "Extracting dependencies..."
 
+
 # Boost
 if [ -z $APPVEYOR ]; then
 	printf "Boost 1.58.0... "
@@ -387,49 +386,59 @@ cd $DEPS
 echo Done.
 
 
-# Ogre
-printf "Ogre 1.9... "
+# OpenAL
+printf "OpenAL-Soft 1.16.0... "
+if [ -d openal-soft-1.16.0-bin ]; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf openal-soft-1.16.0-bin
+	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+fi
+
+OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
+
+add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
+	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
+
+echo Done.
+
+
+# OSG
+printf "OSG 3.3.8... "
 cd $DEPS_INSTALL
 
-if [ -d Ogre ]; then
-	printf "Exists. (No version check) "
+if [ -d OSG ] && \
+	grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+	grep "OPENSCENEGRAPH_MINOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+	grep "OPENSCENEGRAPH_PATCH_VERSION    8" OSG/include/osg/Version > /dev/null
+then
+	printf "Exists. "
 elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf Ogre
-	eval 7z x -y $DEPS/Ogre-1.9-win$BITS.7z $STRIP
-	mv Ogre-1.9-win$BITS Ogre
+	rm -rf OSG
+	eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
+	mv OSG-3.3.8-win$BITS OSG
 fi
 
-OGRE_SDK="`real_pwd`/Ogre"
+OSG_SDK="`real_pwd`/OSG"
 
-add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
+add_cmake_opts -DOSG_DIR="$OSG_SDK"
 
 if [ $CONFIGURATION == "Debug" ]; then
-	SUFFIX="_d"
+	SUFFIX="d"
 else
 	SUFFIX=""
 fi
+add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
+	`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll
 
-add_runtime_dlls `pwd`/Ogre/bin/$CONFIGURATION/cg.dll \
-	`pwd`/Ogre/bin/$CONFIGURATION/{OgreMain,OgreOverlay,Plugin_CgProgramManager,Plugin_ParticleFX,RenderSystem_Direct3D9,RenderSystem_GL}$SUFFIX.dll
-
-cd $DEPS
-
-echo Done.
-
-
-# OpenAL
-printf "OpenAL-Soft 1.16.0... "
-if [ -d openal-soft-1.16.0-bin ]; then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf openal-soft-1.16.0-bin
-	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
-fi
+OSG_PLUGINS=""
+add_osg_dlls() {
+	OSG_PLUGINS="$OSG_PLUGINS $@"
+}
 
-OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
+add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll
 
-add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
-	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
+cd $DEPS
 
 echo Done.
 
@@ -572,6 +581,13 @@ if [ -z $APPVEYOR ]; then
 		echo "  `basename $DLL`."
 		cp "$DLL" $CONFIGURATION/
 	done
+	echo "OSG Plugin DLLs..."
+	mkdir -p $CONFIGURATION/osgPlugins-3.3.8
+	for DLL in $OSG_PLUGINS; do
+		echo "  `basename $DLL`."
+		cp "$DLL" $CONFIGURATION/osgPlugins-3.3.8
+	done
+	echo
 fi
 
 exit $RET

CI/build.msvc.sh

@@ -10,10 +10,14 @@ fi
 
 case $PLATFORM in
 	x32|x86|i686|i386|win32|Win32 )
-		BITS=32 ;;
+		BITS=32
+		PLATFORM=Win32
+		;;
 
 	x64|x86_64|x86-64|win64|Win64 )
-		BITS=64 ;;
+		BITS=64
+		PLATFORM=x64
+		;;
 
 	* )
 		echo "Unknown platform $PLATFORM."
@@ -40,4 +44,12 @@ if [ $? -ne 0 ]; then
 	}
 fi
 
-msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+if [ -z $APPVEYOR ]; then
+	msbuild OpenMW.sln //t:Build //m:8
+else
+	msbuild OpenMW.sln //t:Build //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+fi
+
+if [ ! -z $PACKAGE ]; then
+	msbuild PACKAGE.vcxproj //t:Build //m:8
+fi

appveyor.yml

@@ -21,6 +21,12 @@ os: unstable
 clone_depth: 1
 
 cache:
+    - C:\projects\openmw\deps\Bullet-2.83.5-win32.7z
+    - C:\projects\openmw\deps\Bullet-2.83.5-win64.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z
+    - C:\projects\openmw\deps\OSG-3.3.8-win32.7z
+    - C:\projects\openmw\deps\OSG-3.3.8-win64.7z
     - 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