Changeset 2665

Timestamp:

Feb 14, 2009, 11:35:12 PM (16 years ago)

Author:

rgrieder

Message:

Manual merge.

Location:

code/branches/buildsystem3/src/orxonox

Files:

• objects/collisionshapes/CMakeLists.txt (modified) (2 diffs)
• objects/items/CMakeLists.txt (modified) (1 diff)
• overlays/notifications/CMakeLists.txt (modified) (1 diff)
• overlays/stats/CMakeLists.txt (modified) (2 diffs)
• pch/havepch/OrxonoxStableHeaders.h (modified) (3 diffs)

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

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BoxCollisionShape.cc
   CollisionShape.cc
@@ -8 +8 @@
   WorldEntityCollisionShape.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

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

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Item.cc
   Engine.cc
   MultiStateEngine.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/overlays/notifications/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Notification.cc
   NotificationManager.cc
   NotificationQueue.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/overlays/stats/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   CreateLines.cc
   Scoreboard.cc
@@ -5 +5 @@
   StatsTest.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/pch/havepch/OrxonoxStableHeaders.h

@@ -47 +47 @@
 #include <Ogre.h>
 #include <CEGUI.h>
-#include "ois/OIS.h"
 #include <boost/thread/recursive_mutex.hpp>
 //#include <boost/thread/mutex.hpp>
@@ -53 +52 @@
 //#include <boost/thread/thread.hpp>
 #include <boost/static_assert.hpp>
-#include <ticpp.h>
+
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+#include <ois/OIS.h>
+#include <tinyxml/ticpp.h>
 #include <tolua++.h>
 
@@ -94 +96 @@
 #include "core/input/InputManager.h"
 
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 
-#include "Settings.h"
+//#include "Settings.h"
 
 //#endif /* ifdef NDEBUG */