Changeset 5738 for code/trunk/src/orxonox/CMakeLists.txt

Timestamp:

Sep 1, 2009, 2:03:05 AM (16 years ago)

Author:

landauf

Message:

merged libraries2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (3 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -26 +26 @@
   PlayerManager.cc
 
-  InGameConsole.cc
-  Map.cc
+  Level.cc
+  Radar.cc
+  Scene.cc
 )
-ADD_SUBDIRECTORY(gamestates)
+
+ADD_SUBDIRECTORY(collisionshapes)
+ADD_SUBDIRECTORY(controllers)
+ADD_SUBDIRECTORY(gametypes)
+ADD_SUBDIRECTORY(graphics)
+ADD_SUBDIRECTORY(infos)
 ADD_SUBDIRECTORY(interfaces)
+ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(overlays)
-ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(sound)
-ADD_SUBDIRECTORY(tools)
-
-# Translate argument
-IF(ORXONOX_USE_WINMAIN)
-  SET(ORXONOX_WIN32 WIN32)
-ENDIF()
+ADD_SUBDIRECTORY(weaponsystem)
+ADD_SUBDIRECTORY(worldentities)
 
 ORXONOX_ADD_LIBRARY(orxonox
@@ -45 +48 @@
   TOLUA_FILES
     LevelManager.h
-    objects/pickup/BaseItem.h
-    objects/pickup/PickupInventory.h
+    pickup/BaseItem.h
+    pickup/PickupInventory.h
   DEFINE_SYMBOL
     "ORXONOX_SHARED_BUILD"
@@ -72 +75 @@
 )
 
-ORXONOX_ADD_EXECUTABLE(orxonox-main
-  # When defined as WIN32 this removes the console window on Windows
-  ${ORXONOX_WIN32}
-  LINK_LIBRARIES
-    orxonox
-  SOURCE_FILES
-    Orxonox.cc
-  OUTPUT_NAME orxonox
-)
-
-GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
-GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
-SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
-
 
 # When using Visual Studio we want to use the output directory as working