Changeset 2664 for code/branches/buildsystem3/src/orxonox/objects

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/orxonox/objects/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/Level.cc (modified) (1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/infos/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)

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

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   EventListener.cc
   EventDispatcher.cc
@@ -14 +14 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES collisionshapes)
-ADD_SOURCE_DIRECTORY(SRC_FILES controllers)
-ADD_SOURCE_DIRECTORY(SRC_FILES gametypes)
-ADD_SOURCE_DIRECTORY(SRC_FILES infos)
-ADD_SOURCE_DIRECTORY(SRC_FILES items)
-ADD_SOURCE_DIRECTORY(SRC_FILES pickup)
-ADD_SOURCE_DIRECTORY(SRC_FILES quest)
-ADD_SOURCE_DIRECTORY(SRC_FILES weaponSystem)
-ADD_SOURCE_DIRECTORY(SRC_FILES worldentities)
+ADD_SUBDIRECTORY(collisionshapes)
+ADD_SUBDIRECTORY(controllers)
+ADD_SUBDIRECTORY(gametypes)
+ADD_SUBDIRECTORY(infos)
+ADD_SUBDIRECTORY(pickup)
+ADD_SUBDIRECTORY(quest)
+ADD_SUBDIRECTORY(weaponSystem)
+ADD_SUBDIRECTORY(worldentities)
 
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/controllers/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
   HumanController.cc
@@ -6 +6 @@
   ScriptController.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Gametype.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
   Info.cc
@@ -6 +6 @@
   GametypeInfo.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   PickupSpawner.cc
   BaseItem.cc
@@ -5 +5 @@
   ShipEquipment.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/quest/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   AddQuest.cc
   AddQuestHint.cc
@@ -18 +18 @@
   Rewardable.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Munition.cc
   Weapon.cc
@@ -8 +8 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES munitions)
-ADD_SOURCE_DIRECTORY(SRC_FILES projectiles)
-ADD_SOURCE_DIRECTORY(SRC_FILES weapons)
-
-ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(munitions)
+ADD_SUBDIRECTORY(projectiles)
+ADD_SUBDIRECTORY(weapons)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   LaserGunMunition.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc
   Projectile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Fusion.cc
   LaserGun.cc
 #  Missile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   WorldEntity.cc
   StaticEntity.cc
@@ -21 +21 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES pawns)
-ADD_SOURCE_DIRECTORY(SRC_FILES triggers)
-
-ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(pawns)
+ADD_SUBDIRECTORY(triggers)

code/branches/buildsystem3/src/orxonox/objects/worldentities/pawns/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Spectator.cc
   Pawn.cc
   SpaceShip.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Trigger.cc
   DistanceTrigger.cc
@@ -5 +5 @@
   PlayerTrigger.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)