Changeset 11109

Timestamp:

Feb 6, 2016, 3:27:55 PM (9 years ago)

Author:

zifloria

Message:

changed build settings for tardis to use the new paths on the new tardis system

File:

• code/trunk/cmake/LibraryConfigTardis.cmake (modified) (2 diffs)

code/trunk/cmake/LibraryConfigTardis.cmake

@@ -40 +40 @@
 #  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
 
-  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
-  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
-  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
-  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
+#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
+#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
+#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
+#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
 
   #Solution to the problem that on the new tardis machines, we needed to run Orxonox with the command
@@ -58 +58 @@
   #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
 
+  # New paths for the new tardis system. The ogre includes need to be at ../dependencies.
+  SET(OGRE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/ogre_src_v1-8-0/OgreMain/include/")
+  SET(OGRE_LIBRARY_OPTIMIZED "/usr/lib/x86_64-linux-gnu/libOgreMain.so.1.8.0")
+  SET(OGRE_PLUGIN_Plugin_ParticleFX_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/Plugin_ParticleFX.so")
+  SET(OGRE_PLUGIN_RenderSystem_GL_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/RenderSystem_GL.so")
+
 
   # Sandro fix: add flag that re-enables boost threads. This makes the combination