[Orxonox-commit 5003] r114 - in windows/precompiled_dependencies: . mingw

[landauf at orxonox.net]

Author: landauf
Date: 2013-09-07 17:18:29 +0200 (Sat, 07 Sep 2013)
New Revision: 114

Added:
   windows/precompiled_dependencies/OrxonoxDeps_130907_7.0_MinGW.7z
Modified:
   windows/precompiled_dependencies/mingw/orxonox_dependencies.txt
Log:
created new dependency package for mingw containing boost 1.54, ogre 1.8.1, cegui 0.7.9

Added: windows/precompiled_dependencies/OrxonoxDeps_130907_7.0_MinGW.7z
===================================================================
(Binary files differ)


Property changes on: windows/precompiled_dependencies/OrxonoxDeps_130907_7.0_MinGW.7z
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: windows/precompiled_dependencies/mingw/orxonox_dependencies.txt
===================================================================
--- windows/precompiled_dependencies/mingw/orxonox_dependencies.txt	2013-09-01 16:42:20 UTC (rev 113)
+++ windows/precompiled_dependencies/mingw/orxonox_dependencies.txt	2013-09-07 15:18:29 UTC (rev 114)
@@ -1,19 +1,15 @@
 Dependencies
 
+
+alias m='make -j4'
+
 ## Boost: ##
 cd boost_x_xx_x/
-cd tools/build/v2/
 run bootstrap.bat
-bjam install --prefix=../../../boostbuild
-
-bjam --build-dir=build toolset=gcc --build-type=complete stage -j8
-or
 bjam --build-dir=build toolset=gcc variant=release link=shared threading=multi --build-type=complete stage -j4
 
-
-## bcp: ##
-cd boost_x_xx_x/tools/bcp
-../../boostbuild/bin/bjam toolset=gcc
+cd tools/bcp
+../../bjam toolset=gcc -j4
 cd ../..
 mkdir stripped_orxonox
 ./bin.v2/tools/bcp/gcc-mingw-4.5.2/release/link-static/bcp array asio assign bimap bind circular_buffer compressed_pair config date_time filesystem foreach format function intrusive logic member_function mpl operators preprocessor range ref scope_exit smart_ptr static_assert thread unordered ./stripped_orxonox
@@ -31,13 +27,13 @@
 ## Ogre dependencies ##
 get here: https://bitbucket.org/cabalistic/ogredeps
 DirectX SDK installieren
-make zlib a SHARED lib, so we can use it for orxonox as well
+make zlib a SHARED lib, so we can use it for orxonox as well (edit src/zlib/CMakeLists.txt)
 cd ogredeps
 mkdir build
-cm
+cd build
+cm ..
 m
 make install
-copy bin, include, and lib folders to ogre/Dependencies (maybe replace cg lib and header with externally installed version)
 
 
 ## Ogre: ##
@@ -51,7 +47,7 @@
 cd ogre_src_vx-x-x/
 mkdir release
 cd release
-cmake -D "CMAKE_BUILD_TYPE=Release" -G "MSYS Makefiles" .. -DENV_POCO_ROOT=/home/Xen/libs/poco/poco-1.4.1p1
+cmake -DCMAKE_BUILD_TYPE=Release -DOGRE_DEPENDENCIES_DIR=../../ogre-dependencies/xxxxxxxx/build/ogredeps -DENV_POCO_ROOT=/home/Xen/libs/poco/poco-x.x.x -G "MSYS Makefiles" ..
 m
 
 copy OgreBuildSettings.h to orxonox dependencies AND cegui dependencies
@@ -59,7 +55,7 @@
 cd ..
 mkdir debug
 cd debug
-cmake -D "CMAKE_BUILD_TYPE=Debug" -G "MSYS Makefiles" ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DOGRE_DEPENDENCIES_DIR=../../ogre-dependencies/xxxxxxxx/build/ogredeps -DENV_POCO_ROOT=/home/Xen/libs/poco/poco-x.x.x -G "MSYS Makefiles" ..
 m
 
 
@@ -133,8 +129,8 @@
  - activate tinyxml and set it as the default XML parser
  - set MINIZIP_RESOURCE_PROVIDER = false
  - set OGRE_RENDERER = true
- - set Ogre path: OGRE_PATHS = { "C:/msys/home/Xen/libs/ogre/ogre_src_v1-7-2", "OgreMain/include", "release/bin" }
- - add extra path: { "C:/msys/home/Xen/libs/poco/poco-1.4.1p1", "Foundation/include", "lib/MinGW/ia32", "CEGUIOgreRenderer" }
+ - set Ogre path: OGRE_PATHS = { "C:/msys/home/Xen/libs/ogre/ogre_src_v1-8-1", "OgreMain/include", "release/bin" }
+ - add extra path: { "C:/msys/home/Xen/libs/poco/poco-1.4.6p2", "Foundation/include", "lib/MinGW/ia32", "CEGUIOgreRenderer" }
 premake --file cegui.lua --target cb-gcc
 open CEGUI.workspace with codeblocks
 add "PocoFoundation" to "Link libraries" in tab "Linker settings" of Build options of CEGUIOgreRenderer