[Orxonox-commit 1152] r5873 - in code/branches/core5/src: libraries libraries/core libraries/network/packet libraries/tools libraries/util modules/pong orxonox orxonox/graphics orxonox/overlays

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Oct 4 20:03:27 CEST 2009 

Author: rgrieder
Date: 2009-10-04 20:03:26 +0200 (Sun, 04 Oct 2009)
New Revision: 5873

Modified:
   code/branches/core5/src/libraries/CMakeLists.txt
   code/branches/core5/src/libraries/core/CMakeLists.txt
   code/branches/core5/src/libraries/network/packet/CMakeLists.txt
   code/branches/core5/src/libraries/tools/CMakeLists.txt
   code/branches/core5/src/libraries/util/CMakeLists.txt
   code/branches/core5/src/modules/pong/CMakeLists.txt
   code/branches/core5/src/orxonox/CMakeLists.txt
   code/branches/core5/src/orxonox/graphics/CMakeLists.txt
   code/branches/core5/src/orxonox/overlays/CMakeLists.txt
Log:
Added a few more compilations in our own libraries.
Also fixed a bug in tools/CMakeLists.txt (ADD instead of SET_SOURCE_FILES caused the list of files to grow every cmake run, but REMOVE_DUPLICATES took care of it anyway).

Modified: code/branches/core5/src/libraries/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/libraries/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -24,7 +24,7 @@
 
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(util)

Modified: code/branches/core5/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/core/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/libraries/core/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -18,7 +18,6 @@
  #
 
 SET_SOURCE_FILES(CORE_SRC_FILES
-  ConfigFileManager.cc
   ConfigValueContainer.cc
   Core.cc
   DynLib.cc
@@ -31,16 +30,13 @@
   GUIManager.cc
   Language.cc
   LuaState.cc
-  MemoryArchive.cc
   ObjectListBase.cc
   OrxonoxClass.cc
-  PathConfig.cc
   Resource.cc
   ScopedSingletonManager.cc
   WindowEventListener.cc
 
   # command
-  ArgumentCompletionFunctions.cc
   CommandEvaluation.cc
   CommandExecutor.cc
   CommandLine.cc
@@ -66,12 +62,22 @@
   IRC.cc
   Shell.cc
   TclBind.cc
-  TclThreadManager.cc
 
+COMPILATION_BEGIN FilesystemCompilation.cc
+  ArgumentCompletionFunctions.cc
+  ConfigFileManager.cc
+  MemoryArchive.cc
+  PathConfig.cc
+COMPILATION_END
+
   # multithreading
+  ThreadPool.cc
+COMPILATION_BEGIN ThreadCompilation.cc
+  TclThreadManager.cc
   Thread.cc
-  ThreadPool.cc
+COMPILATION_END
 )
+
 ADD_SUBDIRECTORY(input)
 
 ORXONOX_ADD_LIBRARY(core

Modified: code/branches/core5/src/libraries/network/packet/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/network/packet/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/libraries/network/packet/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -1,4 +1,5 @@
 ADD_SOURCE_FILES(NETWORK_SRC_FILES
+COMPILATION_BEGIN PacketCompilation.cc
   Acknowledgement.cc
   Chat.cc
   ClassID.cc
@@ -8,6 +9,7 @@
   Gamestate.cc
   Packet.cc
   Welcome.cc
+COMPILATION_END
 )
 
 ADD_SOURCE_FILES(NETWORK_HDR_FILES

Modified: code/branches/core5/src/libraries/tools/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/tools/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/libraries/tools/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -1,21 +1,23 @@
-ADD_SOURCE_FILES(TOOLS_SRC_FILES
+SET_SOURCE_FILES(TOOLS_SRC_FILES
+COMPILATION_BEGIN ResourceCompilation.cc
+  ResourceCollection.cc
+  ResourceLocation.cc
+COMPILATION_END
+  TextureGenerator.cc
+  Timer.cc
+COMPILATION_BEGIN OgreCompilation.cc
   BillboardSet.cc
   DynamicLines.cc
   DynamicRenderable.cc
   Mesh.cc
   ParticleInterface.cc
-  ResourceCollection.cc
-  ResourceLocation.cc
   Shader.cc
-  TextureGenerator.cc
-  Timer.cc
+COMPILATION_END
 )
 ADD_SUBDIRECTORY(interfaces)
 
 ORXONOX_ADD_LIBRARY(tools
   FIND_HEADER_FILES
-  PCH_FILE
-    ToolsPrecompiledHeaders.h
   DEFINE_SYMBOL
     "TOOLS_SHARED_BUILD"
   LINK_LIBRARIES

Modified: code/branches/core5/src/libraries/util/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/util/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/libraries/util/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -18,20 +18,22 @@
  #
 
 SET_SOURCE_FILES(UTIL_SRC_FILES
+  Exception.cc
+  Math.cc
+  MultiType.cc
+  Scope.cc
+  StringUtils.cc
+COMPILATION_BEGIN StableCompilation.cc
   Clipboard.cc
   Clock.cc
   CRC32.cc
-  Exception.cc
   ExprParser.cc
-  Math.cc
-  MultiType.cc
   OutputBuffer.cc
   OutputHandler.cc
-  Scope.cc
   SignalHandler.cc
   Sleep.cc
-  StringUtils.cc
   SubString.cc
+COMPILATION_END
 )
 
 IF(GCC_NO_SYSTEM_HEADER_SUPPORT)

Modified: code/branches/core5/src/modules/pong/CMakeLists.txt
===================================================================
--- code/branches/core5/src/modules/pong/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/modules/pong/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -1,4 +1,5 @@
 SET_SOURCE_FILES(PONG_SRC_FILES
+#COMPILATION_BEGIN PongCompilation.cc
   Pong.cc
   PongAI.cc
   PongBall.cc
@@ -6,14 +7,12 @@
   PongBot.cc
   PongCenterpoint.cc
   PongScore.cc
+#COMPILATION_END
 )
 
 ORXONOX_ADD_LIBRARY(pong
   MODULE
   FIND_HEADER_FILES
-  PCH_FILE
-    PongPrecompiledHeaders.h
-  PCH_NO_DEFAULT
   DEFINE_SYMBOL
     "PONG_SHARED_BUILD"
   LINK_LIBRARIES

Modified: code/branches/core5/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/core5/src/orxonox/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/orxonox/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -24,16 +24,16 @@
 )
 
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
+  Level.cc
+  LevelManager.cc
   Main.cc
-
-  CameraManager.cc
-  LevelManager.cc
   PawnManager.cc
   PlayerManager.cc
-
-  Level.cc
   Radar.cc
+COMPILATION_BEGIN SceneCompilation.cc
+  CameraManager.cc
   Scene.cc
+COMPILATION_END
 )
 
 ADD_SUBDIRECTORY(collisionshapes)

Modified: code/branches/core5/src/orxonox/graphics/CMakeLists.txt
===================================================================
--- code/branches/core5/src/orxonox/graphics/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/orxonox/graphics/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -1,12 +1,14 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  Backlight.cc
   Billboard.cc
   BlinkingBillboard.cc
-  Camera.cc
   FadingBillboard.cc
   GlobalShader.cc
-  Light.cc
   Model.cc
   ParticleEmitter.cc
   ParticleSpawner.cc
+COMPILATION_BEGIN GraphicsCompilation.cc
+  Backlight.cc
+  Camera.cc
+  Light.cc
+COMPILATION_END
 )

Modified: code/branches/core5/src/orxonox/overlays/CMakeLists.txt
===================================================================
--- code/branches/core5/src/orxonox/overlays/CMakeLists.txt	2009-10-04 17:27:35 UTC (rev 5872)
+++ code/branches/core5/src/orxonox/overlays/CMakeLists.txt	2009-10-04 18:03:26 UTC (rev 5873)
@@ -2,6 +2,8 @@
   OrxonoxOverlay.cc
   OverlayGroup.cc
 
+COMPILATION_BEGIN OverlayCompilation.cc
   InGameConsole.cc
   Map.cc
+COMPILATION_END
 )

More information about the Orxonox-commit mailing list