Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11109


Ignore:
Timestamp:
Feb 6, 2016, 3:27:55 PM (4 years ago)
Author:
zifloria
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/LibraryConfigTardis.cmake

    r11097 r11109  
    4040#  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
    4141
    42   LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
    43   LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
    44   LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
    45   LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
     42#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
     43#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
     44#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
     45#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
    4646
    4747  #Solution to the problem that on the new tardis machines, we needed to run Orxonox with the command
     
    5858  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
    5959
     60  # New paths for the new tardis system. The ogre includes need to be at ../dependencies.
     61  SET(OGRE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/ogre_src_v1-8-0/OgreMain/include/")
     62  SET(OGRE_LIBRARY_OPTIMIZED "/usr/lib/x86_64-linux-gnu/libOgreMain.so.1.8.0")
     63  SET(OGRE_PLUGIN_Plugin_ParticleFX_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/Plugin_ParticleFX.so")
     64  SET(OGRE_PLUGIN_RenderSystem_GL_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/RenderSystem_GL.so")
     65
    6066
    6167  # Sandro fix: add flag that re-enables boost threads. This makes the combination
Note: See TracChangeset for help on using the changeset viewer.