Changeset 757 for code/branches/FICN_test/src/orxonox

Timestamp:

Dec 31, 2007, 2:13:43 PM (17 years ago)

Author:

rgrieder

Message:

• complete restructured all the CMLs, tried to avoid circular dependencies

Location:

code/branches/FICN_test/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (2 diffs)
• hud/CMakeLists.txt (deleted)
• objects/CMakeLists.txt (deleted)
• objects/test2.h (modified) (1 diff)
• objects/weapon/CMakeLists.txt (deleted)
• particle/CMakeLists.txt (deleted)
• tools/CMakeLists.txt (deleted)

code/branches/FICN_test/src/orxonox/CMakeLists.txt

@@ -1 @@
-PROJECT(Orxonox)
-
 ADD_SUBDIRECTORY(core)
-ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(objects)
-ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(particle)
-
-INCLUDE_DIRECTORIES(tools)
 
 SET( ORXONOX_SRC_FILES
+  GraphicsEngine.cc
+  Main.cc
   Orxonox.cc
   SpaceshipSteering.cc
-  Main.cc
-  GraphicsEngine.cc
+  hud/Hud.cc
+  particle/ParticleInterface.cc
+  tools/BillboardSet.cc
+  tools/Light.cc
+  tools/Mesh.cc
+  objects/Ambient.cc
+  objects/Camera.cc
+  objects/Explosion.cc
+  objects/Fighter.cc
+  objects/Model.cc
+  objects/NPC.cc
+  ojbects/Projectile.cc
+  objects/Skybox.cc
+  objects/SpaceShip.cc
+# objects/SpaceshipSteeringObject.cc
+# objects/test1.cc
+# objects/test2.cc
+# objects/test3.cc
+  objects/WorldEntity.cc
+  objects/weapon/AmmunitionDump.cc
+  objects/weapon/BarrelGun.cc
+  objects/weapon/BaseWeapon.cc
+  objects/weapon/Bullet.cc
+  objects/weapon/BulleManager.cc
+  objects/weapon/WeaponStation.cc
 )
 
-IF(WIN32)
-  SET( OBJECTS_SRC_FILES
-    ${OBJECTS_SRC_FILES}
-    ${TOOLS_SRC_FILES}
-  )
-ELSE(WIN32)
-  SET(LINK_OBJECTS_LIBRARY objects)
-  SET(LINK_TOOLS_LIBRARY tools)
-ENDIF(WIN32)
+ADD_EXECUTABLE(${Orxonox_BINARY_DIR}/main ${ORXONOX_SRC_FILES} )
 
-IF(WIN32)
-#  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
-ELSE(WIN32)
-  ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
-ENDIF(WIN32)
+SET_TARGET_PROPERTIES( main PROPERTIES LINK_FLAGS "--no-undefined" )
 
-ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})
-
-SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
-
-TARGET_LINK_LIBRARIES( ../../bin/main
+TARGET_LINK_LIBRARIES( main
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}
-  loader
+  util
+  core
   audio
   network
-  core
-  hud
-  ${LINK_OBJECTS_LIBRARY}
-  ${LINK_TOOLS_LIBRARY}
-  util
-  particle
+  loader
 )
 

code/branches/FICN_test/src/orxonox/core/CMakeLists.txt

@@ -1 @@
-PROJECT(Orxonox)
-
 SET( CORE_SRC_FILES
   BaseObject.cc
@@ -17 +15 @@
 )
 
-IF(WIN32)
-  ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
-ELSE(WIN32)
-  ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
-ENDIF(WIN32)
+ADD_LIBRARY(${Orxonox_BINARY_DIR}/core SHARED ${CORE_SRC_FILES})
+SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
+
+TARGET_LINK_LIBRARIES( core
+  util
+)

code/branches/FICN_test/src/orxonox/objects/test2.h

@@ -3 +3 @@
 
 #include "orxonox/core/BaseObject.h"
-#include "Timer.h"
+#include "../tools/Timer.h"
 
 namespace orxonox