Changeset 754 for code/branches/FICN_test/src/orxonox/objects

Timestamp:

Dec 31, 2007, 10:33:35 AM (16 years ago)

Author:

rgrieder

Message:

• some unstable changes to CMLs

Location:

code/branches/FICN_test/src/orxonox/objects

Files:

• CMakeLists.txt (modified) (2 diffs)
• weapon (moved) (moved from code/branches/FICN_test/src/orxonox/objects/weapon_system)
• weapon/CMakeLists.txt (added)

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-INCLUDE_DIRECTORIES(../tools)
+ADD_SUBDIRECTORY(weapon)
 
 SET( OBJECTS_SRC_FILES
@@ -18 +18 @@
   test2.cc
   test3.cc
-  weapon_system/AmmunitionDump.cc
-  weapon_system/BarrelGun.cc
-  weapon_system/BaseWeapon.cc
-  weapon_system/Bullet.cc
-  weapon_system/BulletManager.cc
-  weapon_system/WeaponStation.cc
+  ${WEAPON_SRC_FILES}
 )
 
-ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
+IF (NOT WIN32)
+  ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( objects
-  util
-  orxonox
-  tools
-)
+  TARGET_LINK_LIBRARIES( objects
+    util
+    orxonox
+    tools
+  )
+ENDIF (NOT WIN32)