Changeset 131 in downloads

Timestamp:

Feb 14, 2016, 10:01:22 PM (9 years ago)

Author:

landauf

Message:

added dependencies for gcc 4.9 and improved build-scripts slightly

Location:

windows/precompiled_dependencies

Files:

• OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-32bit.7z (added)
• OrxonoxDeps_160214_7.1_MinGW-w64-gcc49-64bit.7z (added)
• OrxonoxDeps_160214_7.1_MinGW-w64-gcc49.7z (added)
• mingw64/build_cegui-0-7.sh (modified) (3 diffs)
• mingw64/build_ogre.sh (modified) (1 diff)

windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh

@@ -19 +19 @@
         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
 
@@ -64 +66 @@
         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"
@@ -73 +79 @@
         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"
 

windows/precompiled_dependencies/mingw64/build_ogre.sh

@@ -44 +44 @@
                   -DBOOST_INCLUDEDIR=${TARGET_INC_DIR}/boost \
                   -DOGRE_BUILD_RENDERSYSTEM_D3D11=OFF \
+                  -DOGRE_BUILD_SAMPLES=OFF \
+                  -DOGRE_BUILD_TOOLS=OFF \
                   .. -G "MSYS Makefiles"