Changeset 2458 for code/branches/physics_merge/src

Timestamp:

Dec 15, 2008, 12:37:09 AM (16 years ago)

Author:

rgrieder

Message:

Several build fixed. Something seems to be wrong with the ORXONOX_COMPILER_GCC macro under very special circumstances.

Location:

code/branches/physics_merge/src

Files:

• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/worldentities/Planet.cc (modified) (1 diff)
• orxonox/objects/worldentities/Planet.h (modified) (1 diff)
• util/Integers.h (modified) (1 diff)

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

@@ -48 +48 @@
   tinyxml_orxonox
   tolualib_orxonox
-  LibBulletDynamics
-  LibBulletCollision
-  LibLinearMath
+  BulletDynamics
+  BulletCollision
+  LinearMath
   util
   core

code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc

@@ -33 +33 @@
 
 #include <OgreEntity.h>
-#include <OgreMesh.h>
+#include <OgreBillboardSet.h>
 #include <OgreHardwareVertexBuffer.h>
 #include <OgreMeshManager.h>

code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <OgreMesh.h>
 
 #include "tools/BillboardSet.h"

code/branches/physics_merge/src/util/Integers.h

@@ -49 +49 @@
 typedef unsigned __int32  uint32_t;
 typedef unsigned __int64  uint64_t;
-#elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC
-# include "inttypes.h"
+#else
+# include <inttypes.h>
 #endif