Changeset 2621 for code/branches/buildsystem2/src/orxonox/objects

Timestamp:

Jan 29, 2009, 11:35:54 PM (16 years ago)

Author:

rgrieder

Message:

This commit gets a little ugly, couldn't separate that anymore:

• Renamed UseTolua.cmake to GenerateLuaBindings.cmake
• Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
• Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
• Large scale clean up in BuildConfig.cmake
• You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
• Lots of small changes and fixes

Location:

code/branches/buildsystem2/src/orxonox/objects

Files:

• CMakeLists.txt (modified) (2 diffs)
• controllers/CMakeLists.txt (modified) (1 diff)
• gametypes/CMakeLists.txt (modified) (1 diff)
• infos/CMakeLists.txt (modified) (1 diff)
• pickup/CMakeLists.txt (modified) (1 diff)
• quest/CMakeLists.txt (modified) (1 diff)
• weaponSystem/CMakeLists.txt (modified) (2 diffs)
• weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• weaponSystem/projectiles/CMakeLists.txt (modified) (1 diff)
• weaponSystem/weapons/CMakeLists.txt (modified) (1 diff)
• worldentities/CMakeLists.txt (modified) (2 diffs)
• worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• worldentities/triggers/CMakeLists.txt (modified) (1 diff)

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   EventListener.cc
   EventDispatcher.cc
@@ -13 +13 @@
 )
 
-ADD_SOURCE_DIRECTORY(controllers)
-ADD_SOURCE_DIRECTORY(gametypes)
-ADD_SOURCE_DIRECTORY(infos)
-#ADD_SOURCE_DIRECTORY(pickup)
-ADD_SOURCE_DIRECTORY(quest)
-ADD_SOURCE_DIRECTORY(weaponSystem)
-ADD_SOURCE_DIRECTORY(worldentities)
+ADD_SUBDIRECTORY(controllers)
+ADD_SUBDIRECTORY(gametypes)
+ADD_SUBDIRECTORY(infos)
+#ADD_SUBDIRECTORY(pickup)
+ADD_SUBDIRECTORY(quest)
+ADD_SUBDIRECTORY(weaponSystem)
+ADD_SUBDIRECTORY(worldentities)

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
   HumanController.cc

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

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

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Info.cc
   PlayerInfo.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   ShipEquipmentClasses.cc
   ShipItem.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   AddQuest.cc
   AddQuestHint.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Munition.cc
   Weapon.cc
@@ -7 +7 @@
 )
 
-#ADD_SOURCE_DIRECTORY(munitions)
-#ADD_SOURCE_DIRECTORY(projectiles)
-#ADD_SOURCE_DIRECTORY(weapons)
+#ADD_SUBDIRECTORY(munitions)
+#ADD_SUBDIRECTORY(projectiles)
+#ADD_SUBDIRECTORY(weapons)

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

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

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   LaserGun.cc
   Missile.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   WorldEntity.cc
   PositionableEntity.cc
@@ -16 +16 @@
 )
 
-ADD_SOURCE_DIRECTORY(pawns)
-ADD_SOURCE_DIRECTORY(triggers)
+ADD_SUBDIRECTORY(pawns)
+ADD_SUBDIRECTORY(triggers)

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Spectator.cc
   Pawn.cc

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Trigger.cc
   DistanceTrigger.cc