Changeset 2129

Timestamp:

Nov 4, 2008, 1:37:37 PM (16 years ago)

Author:

rgrieder

Message:

Applied changes from HEAD again. I have found a way to solve the problem..

Location:

code/trunk

Files:

• cmake/AddSourceFiles.cmake (copied) (copied from code/trunk/cmake/AddSourceFiles.cmake)
• src/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gamestates/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/gamestates/CMakeLists.txt)
• src/orxonox/gui/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/gui/CMakeLists.txt)
• src/orxonox/objects/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/objects/CMakeLists.txt)
• src/orxonox/objects/controllers/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/objects/controllers/CMakeLists.txt)
• src/orxonox/overlays/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/overlays/CMakeLists.txt)
• src/orxonox/tools/CMakeLists.txt (copied) (copied from code/trunk/src/orxonox/tools/CMakeLists.txt)

code/trunk/src/CMakeLists.txt

@@ -27 +27 @@
 ENDIF (WIN32)
 
+# Include macro to easily add source files in subdirectories
+INCLUDE(AddSourceFiles)
 
 # Our own libraries

code/trunk/src/orxonox/CMakeLists.txt

@@ -5 +5 @@
   Main.cc
   Settings.cc
-
-  gamestates/GSClient.cc
-  gamestates/GSDedicated.cc
-  gamestates/GSGraphics.cc
-  gamestates/GSGUI.cc
-  gamestates/GSIOConsole.cc
-  gamestates/GSLevel.cc
-  gamestates/GSRoot.cc
-  gamestates/GSServer.cc
-  gamestates/GSStandalone.cc
-
-  gui/GUIManager.cc
-  gui/OgreCEGUIRenderer.cpp
-  gui/OgreCEGUIResourceProvider.cpp
-  gui/OgreCEGUITexture.cpp
-
-  overlays/OrxonoxOverlay.cc
-  overlays/OverlayGroup.cc
-  overlays/OverlayText.cc
-
-  overlays/console/InGameConsole.cc
-
-  overlays/debug/DebugFPSText.cc
-  overlays/debug/DebugRTRText.cc
-
-  overlays/hud/HUDBar.cc
-  overlays/hud/HUDNavigation.cc
-  overlays/hud/HUDRadar.cc
-  overlays/hud/HUDSpeedBar.cc
-  overlays/hud/ChatOverlay.cc
-
-  tools/BillboardSet.cc
-  tools/Mesh.cc
-  tools/ParticleInterface.cc
-  tools/TextureGenerator.cc
-  tools/Timer.cc
-  tools/WindowEventListener.cc
-
-  objects/EventListener.cc
-  objects/EventDispatcher.cc
-  objects/EventTarget.cc
-  objects/Radar.cc
-  objects/RadarListener.cc
-  objects/RadarViewable.cc
-  objects/Tickable.cc
-  objects/Test.cc
-  objects/Script.cc
-
-  objects/Scene.cc
-  objects/worldentities/WorldEntity.cc
-  objects/worldentities/PositionableEntity.cc
-  objects/worldentities/MovableEntity.cc
-  objects/worldentities/ControllableEntity.cc
-  objects/worldentities/Model.cc
-  objects/worldentities/Billboard.cc
-  objects/worldentities/BlinkingBillboard.cc
-  objects/worldentities/Light.cc
-  objects/worldentities/Camera.cc
-  objects/worldentities/CameraPosition.cc
-  objects/worldentities/SpawnPoint.cc
-  objects/worldentities/ParticleEmitter.cc
-  objects/worldentities/ParticleSpawner.cc
-#  objects/worldentities/Backlight.cc
-
-  objects/quest/AddQuest.cc
-  objects/quest/AddQuestHint.cc
-  objects/quest/AddReward.cc
-  objects/quest/ChangeQuestStatus.cc
-  objects/quest/CompleteQuest.cc
-  objects/quest/FailQuest.cc
-  objects/quest/GlobalQuest.cc
-  objects/quest/LocalQuest.cc
-  objects/quest/Quest.cc
-  objects/quest/QuestDescription.cc
-  objects/quest/QuestEffect.cc
-  objects/quest/QuestHint.cc
-  objects/quest/QuestItem.cc
-  objects/quest/QuestManager.cc
-  objects/quest/Rewardable.cc
-
-  objects/weaponSystem/WeaponSystem.cc
-  objects/weaponSystem/WeaponSet.cc
-  objects/weaponSystem/WeaponSlot.cc
-  objects/weaponSystem/Weapon.cc
-  objects/weaponSystem/Munition.cc
-
-  objects/worldentities/triggers/Trigger.cc
-  objects/worldentities/triggers/DistanceTrigger.cc
-  objects/worldentities/triggers/EventTrigger.cc
-
-  objects/worldentities/pawns/Spectator.cc
-  objects/worldentities/pawns/Pawn.cc
-  objects/worldentities/pawns/SpaceShip.cc
-
-  objects/controllers/Controller.cc
-  objects/controllers/HumanController.cc
-
-  objects/infos/Info.cc
-  objects/infos/Level.cc
-  objects/infos/PlayerInfo.cc
-  objects/infos/HumanPlayer.cc
-
-  objects/gametypes/Gametype.cc
-
+  
   tolua/tolua_bind.cc
 )
+
+ADD_SOURCE_FILES(gamestates ORXONOX_GAMESTATES_SRC_FILES ORXONOX_SRC_FILES)
+ADD_SOURCE_FILES(gui        ORXONOX_GUI_SRC_FILES        ORXONOX_SRC_FILES)
+ADD_SOURCE_FILES(objects    ORXONOX_OBJECTS_SRC_FILES    ORXONOX_SRC_FILES)
+ADD_SOURCE_FILES(overlays   ORXONOX_OVERLAYS_SRC_FILES   ORXONOX_SRC_FILES)
+ADD_SOURCE_FILES(tools      ORXONOX_TOOLS_SRC_FILES      ORXONOX_SRC_FILES)
 
 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)