Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 10, 2008, 1:37:36 AM (16 years ago)
Author:
rgrieder
Message:

merged gui back to trunk.
update the media repository!

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/CMakeLists.txt

    r1747 r1755  
    22  GraphicsEngine.cc
    33  Main.cc
    4   Orxonox.cc
    54  Radar.cc
    65  RadarListener.cc
     
    87  Settings.cc
    98  SignalHandler.cc
     9
     10  gamestates/GSClient.cc
     11  gamestates/GSDedicated.cc
     12  gamestates/GSGraphics.cc
     13  gamestates/GSGUI.cc
     14  gamestates/GSIOConsole.cc
     15  gamestates/GSLevel.cc
     16  gamestates/GSRoot.cc
     17  gamestates/GSServer.cc
     18  gamestates/GSStandalone.cc
     19
     20  gui/GUIManager.cc
     21  gui/OgreCEGUIRenderer.cpp
     22  gui/OgreCEGUIResourceProvider.cpp
     23  gui/OgreCEGUITexture.cpp
    1024
    1125  overlays/OrxonoxOverlay.cc
     
    5569ADD_CUSTOM_COMMAND(
    5670  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
    57   COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
    58   DEPENDS tolua
     71  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
     72  DEPENDS tolua ${CMAKE_SOURCE_DIR}/src/orxonox/tolua/tolua.pkg
    5973  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    6074)
     
    8498  ${OGRE_LIBRARIES}
    8599  ${Lua_LIBRARIES}
     100  ${CEGUI_LIBRARIES}
     101  ${CEGUI_SCRIPT_LIBRARIES}
    86102  tinyxml
    87103  tolualib
Note: See TracChangeset for help on using the changeset viewer.