|
Last change
on this file since 2518 was
2485,
checked in by landauf, 16 years ago
|
|
Merged objecthierarchy2 into presentation branch
Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)
Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)
|
-
Property svn:eol-style set to
native
|
|
File size:
1.3 KB
|
| Rev | Line | |
|---|
| [1505] | 1 | SET( ORXONOX_SRC_FILES |
|---|
| [2087] | 2 | CameraManager.cc |
|---|
| [1505] | 3 | GraphicsEngine.cc |
|---|
| [2087] | 4 | LevelManager.cc |
|---|
| [1505] | 5 | Main.cc |
|---|
| [2485] | 6 | PawnManager.cc |
|---|
| [2171] | 7 | PlayerManager.cc |
|---|
| [1535] | 8 | Settings.cc |
|---|
| [2129] | 9 | |
|---|
| [1844] | 10 | tolua/tolua_bind.cc |
|---|
| [1505] | 11 | ) |
|---|
| 12 | |
|---|
| [2130] | 13 | ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gamestates) |
|---|
| 14 | ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gui) |
|---|
| 15 | ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES objects) |
|---|
| 16 | ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES overlays) |
|---|
| 17 | ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES tools) |
|---|
| [2129] | 18 | |
|---|
| [1810] | 19 | GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION) |
|---|
| [1505] | 20 | ADD_CUSTOM_COMMAND( |
|---|
| [1843] | 21 | OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h |
|---|
| [1755] | 22 | COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg |
|---|
| [1815] | 23 | DEPENDS |
|---|
| 24 | tolua_orxonox |
|---|
| 25 | tolua/tolua.pkg |
|---|
| 26 | gui/GUIManager.h |
|---|
| [1505] | 27 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib |
|---|
| 28 | ) |
|---|
| [2087] | 29 | |
|---|
| 30 | |
|---|
| [1505] | 31 | ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} ) |
|---|
| 32 | |
|---|
| 33 | IF(NETWORKTRAFFIC_TESTING_ENABLED) |
|---|
| 34 | |
|---|
| 35 | SET( ORXONOXS_SRC_FILES |
|---|
| 36 | GraphicsEngine.cc |
|---|
| 37 | objects/Camera.cc |
|---|
| [2087] | 38 | CameraManager.cc |
|---|
| [1505] | 39 | ) |
|---|
| 40 | |
|---|
| 41 | ADD_LIBRARY(orxonoxs SHARED ${ORXONOX_SRC_FILES}) |
|---|
| 42 | ENDIF(NETWORKTRAFFIC_TESTING_ENABLED) |
|---|
| 43 | |
|---|
| 44 | TARGET_LINK_LIBRARIES( orxonox |
|---|
| 45 | ${OGRE_LIBRARIES} |
|---|
| [1755] | 46 | ${CEGUI_LIBRARIES} |
|---|
| [1810] | 47 | lua_orxonox |
|---|
| 48 | ceguilua_orxonox |
|---|
| 49 | tinyxml_orxonox |
|---|
| 50 | tolualib_orxonox |
|---|
| [2459] | 51 | BulletDynamics |
|---|
| 52 | BulletCollision |
|---|
| 53 | LinearMath |
|---|
| [1505] | 54 | util |
|---|
| 55 | core |
|---|
| 56 | audio |
|---|
| 57 | network |
|---|
| 58 | ) |
|---|
| 59 | |
|---|
Note: See
TracBrowser
for help on using the repository browser.
