Changeset 2445 for code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h

Timestamp:

Dec 14, 2008, 7:06:12 PM (15 years ago)

Author:

rgrieder

Message:

Small adjustments due to the merge.

File:

• code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)

code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h

@@ -47 +47 @@
 #include <Ogre.h>
 #include <CEGUI.h>
-#include "ois/OIS.h"
-//#include "btBulletCollisionCommon.h"
-//#include "btBulletDynamicsCommon.h"
 #include <boost/thread/recursive_mutex.hpp>
 //#include <boost/thread/mutex.hpp>
@@ -55 +52 @@
 //#include <boost/thread/thread.hpp>
 #include <boost/static_assert.hpp>
+
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "ois/OIS.h"
 #include "tinyxml/ticpp.h"
 #include "tinyxml/tinyxml.h"