[Orxonox-commit 6468] r131 - in windows/precompiled_dependencies: . mingw64

[landauf at orxonox.net]

Author: landauf
Date: 2016-02-14 22:01:22 +0100 (Sun, 14 Feb 2016)
New Revision: 131

Added:
   windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-32bit.7z
   windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-64bit.7z
   windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49.7z
Modified:
   windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh
   windows/precompiled_dependencies/mingw64/build_ogre.sh
Log:
added dependencies for gcc 4.9 and improved build-scripts slightly

Added: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-32bit.7z
===================================================================
(Binary files differ)


Property changes on: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-32bit.7z
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-64bit.7z
===================================================================
(Binary files differ)


Property changes on: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-64bit.7z
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49.7z
===================================================================
(Binary files differ)


Property changes on: windows/precompiled_dependencies/OrxonoxDeps_160214_7.1_MinGW-w64-gcc49.7z
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh	2016-02-14 16:57:43 UTC (rev 130)
+++ windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh	2016-02-14 21:01:22 UTC (rev 131)
@@ -18,6 +18,8 @@
 	check_result $? "remove build output"
 	find "." -name "*.d" -exec rm -rf {} \;
 	check_result $? "remove build output"
+	sed -i "s/library(\"OgreMain\"); library(\".*\")/library(\"OgreMain\", \"_d\")/" "RendererModules/Ogre/premake.lua"
+	check_result $? "remove boost system library"
 fi
 
 if [ $DO_BUILD -eq 1 ]
@@ -63,6 +65,10 @@
 	" > $CONFIG_FILE
 	check_result $? "create new config-file"
 	
+	BOOST_SYSTEM_LIBRARY=$(find $TARGET_BIN_DIR -name "libboost_system*.dll")
+	BOOST_SYSTEM_LIBRARY_NAME=$(basename $BOOST_SYSTEM_LIBRARY)
+	BOOST_SYSTEM_LIBRARY_NAME=$(echo $BOOST_SYSTEM_LIBRARY_NAME | sed "s/.dll//")
+	
 	# change library names in several premake scripts
 	sed -i "s/\"lua\"/\"lua51\"/" "ScriptingModules/LuaScriptModule/premake.lua"
 	check_result $? "change lua library name"
@@ -72,7 +78,7 @@
 	check_result $? "change lua library name"
 	sed -i "s/\"xerces-c_3\"/\"xerces-c\"/" "XMLParserModules/XercesParser/premake.lua"
 	check_result $? "change xerces library name"
-	sed -i "s/library(\"OgreMain\", \"_d\")/library(\"OgreMain\"); library(\"libboost_system-mgw48-mt-1_60\")/" "RendererModules/Ogre/premake.lua"
+	sed -i "s/library(\"OgreMain\", \"_d\")/library(\"OgreMain\"); library(\"${BOOST_SYSTEM_LIBRARY_NAME}\")/" "RendererModules/Ogre/premake.lua"
 	check_result $? "add boost system library"
 
 	# run premake

Modified: windows/precompiled_dependencies/mingw64/build_ogre.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_ogre.sh	2016-02-14 16:57:43 UTC (rev 130)
+++ windows/precompiled_dependencies/mingw64/build_ogre.sh	2016-02-14 21:01:22 UTC (rev 131)
@@ -43,6 +43,8 @@
 		  -DBOOST_LIBRARYDIR=${TARGET_BIN_DIR} \
 		  -DBOOST_INCLUDEDIR=${TARGET_INC_DIR}/boost \
 		  -DOGRE_BUILD_RENDERSYSTEM_D3D11=OFF \
+		  -DOGRE_BUILD_SAMPLES=OFF \
+		  -DOGRE_BUILD_TOOLS=OFF \
 		  .. -G "MSYS Makefiles"
 
 	check_result $? "cmake"