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

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

Files:

• CMakeLists.txt (modified) (3 diffs)
• gamestates/CMakeLists.txt (modified) (1 diff)
• gui/CMakeLists.txt (modified) (1 diff)
• gui/GUIManager.cc (modified) (2 diffs)
• objects/CMakeLists.txt (modified) (2 diffs)
• objects/controllers/CMakeLists.txt (modified) (1 diff)
• objects/gametypes/CMakeLists.txt (modified) (1 diff)
• objects/infos/CMakeLists.txt (modified) (1 diff)
• objects/pickup/CMakeLists.txt (modified) (1 diff)
• objects/quest/CMakeLists.txt (modified) (1 diff)
• objects/weaponSystem/CMakeLists.txt (modified) (2 diffs)
• objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• objects/weaponSystem/projectiles/CMakeLists.txt (modified) (1 diff)
• objects/weaponSystem/weapons/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/CMakeLists.txt (modified) (2 diffs)
• objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/triggers/CMakeLists.txt (modified) (1 diff)
• orxonox.vcproj.user (modified) (4 diffs)
• overlays/CMakeLists.txt (modified) (2 diffs)
• overlays/console/CMakeLists.txt (modified) (1 diff)
• overlays/debug/CMakeLists.txt (modified) (1 diff)
• overlays/hud/CMakeLists.txt (modified) (1 diff)
• pch/nopch/OrxonoxStableHeaders.h (modified) (1 diff)
• tools/CMakeLists.txt (modified) (1 diff)

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

@@ -1 @@
-ADD_SOURCE_FILES(
+SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
   GraphicsEngine.cc
@@ -7 +7 @@
   Settings.cc
 )
+ADD_SUBDIRECTORY(gamestates)
+ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(tools)
+GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
+SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
 
-ADD_SOURCE_DIRECTORY(gamestates)
-ADD_SOURCE_DIRECTORY(gui)
-ADD_SOURCE_DIRECTORY(objects)
-ADD_SOURCE_DIRECTORY(overlays)
-ADD_SOURCE_DIRECTORY(tools)
-
-WRITE_SOURCE_FILES(ORXONOX_SRC_FILES)
-
-TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
+GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
+GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
 
 # Not using precompiled header files: Avoid dependencies
 INCLUDE_DIRECTORIES(pch/nopch)
 
-# Enlarge heap size for precompiled header files
-ADD_CXX_FLAGS("-Zm200" MSVC)
-
-ADD_EXECUTABLE(orxonox ${ORXONOX_SRC_FILES})
+ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})
 GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
@@ -44 +41 @@
   ${CEGUI_LIBRARY}
   ${LUA_LIBRARIES}
-  #${CEGUI_SCRIPT_LIBRARIES}
-  ceguilua_orxonox
+  ${CEGUILUA_LIBRARY}
   ogreceguirenderer_orxonox
-  tinyxml_orxonox
-  tolualib_orxonox
+  tinyxml++_orxonox
+  tolua++_orxonox
   util
   core

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GSDedicated.cc
   GSClient.cc

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

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

code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

@@ -39 +39 @@
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include <ceguilua/CEGUILua.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
+#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
+#   include <ceguilua/CEGUILua.h>
+#else
+#   include <CEGUILua.h>
+#endif
 
 #include "util/Exception.h"
@@ -103 +107 @@
                 //lua_pushnil(luaState_);
                 //lua_setglobal(luaState_, "Core");
-            // TODO: deleting the script module fails an assertation.
+            // TODO: deleting the script module fails an assertion.
             // However there is not much we can do about it since it occurs too when
             // we don't open Core or Orxonox. Might be a CEGUI issue.

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

code/branches/buildsystem2/src/orxonox/orxonox.vcproj.user

@@ -11 +11 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_LIBRARY_BIN_DIR}"
+                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -20 +20 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_LIBRARY_BIN_DIR}"
+                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -29 +29 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_LIBRARY_BIN_DIR}"
+                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -38 +38 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_LIBRARY_BIN_DIR}"
+                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   OrxonoxOverlay.cc
   OverlayGroup.cc
@@ -5 +5 @@
 )
 
-ADD_SOURCE_DIRECTORY(console)
-ADD_SOURCE_DIRECTORY(debug)
-ADD_SOURCE_DIRECTORY(hud)
+ADD_SUBDIRECTORY(console)
+ADD_SUBDIRECTORY(debug)
+ADD_SUBDIRECTORY(hud)

code/branches/buildsystem2/src/orxonox/overlays/console/CMakeLists.txt

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

code/branches/buildsystem2/src/orxonox/overlays/debug/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   DebugFPSText.cc
   DebugRTRText.cc

code/branches/buildsystem2/src/orxonox/overlays/hud/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   HUDBar.cc
   HUDNavigation.cc

code/branches/buildsystem2/src/orxonox/pch/nopch/OrxonoxStableHeaders.h

@@ -35 +35 @@
 #define _OrxonoxStableHeaders_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 #endif /* _OrxonoxStableHeaders_H__ */

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

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardSet.cc
   Mesh.cc