[Orxonox-commit 1029] r5750 - in code/trunk/src: external/bullet libraries/core modules/overlays
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Sep 20 12:06:23 CEST 2009
Author: rgrieder
Date: 2009-09-20 12:06:22 +0200 (Sun, 20 Sep 2009)
New Revision: 5750
Modified:
code/trunk/src/external/bullet/BulletPrecompiledHeaders.h
code/trunk/src/libraries/core/DynLib.cc
code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h
Log:
Fixed case issues and fixed non-PCH build in DynLib.cc on Linux
Modified: code/trunk/src/external/bullet/BulletPrecompiledHeaders.h
===================================================================
--- code/trunk/src/external/bullet/BulletPrecompiledHeaders.h 2009-09-19 22:10:34 UTC (rev 5749)
+++ code/trunk/src/external/bullet/BulletPrecompiledHeaders.h 2009-09-20 10:06:22 UTC (rev 5750)
@@ -39,8 +39,8 @@
///// Stable Headers /////
///////////////////////////////////////////
-#include <bullet/bulletcollision/collisionshapes/btConvexInternalShape.h> // 37
-#include <bullet/bulletcollision/collisiondispatch/btCollisionObject.h> // 33
+#include <bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h> // 37
+#include <bullet/BulletCollision/CollisionDispatch/btCollisionObject.h> // 33
// Just in case some header included windows.h
Modified: code/trunk/src/libraries/core/DynLib.cc
===================================================================
--- code/trunk/src/libraries/core/DynLib.cc 2009-09-19 22:10:34 UTC (rev 5749)
+++ code/trunk/src/libraries/core/DynLib.cc 2009-09-20 10:06:22 UTC (rev 5750)
@@ -41,8 +41,12 @@
# include <windows.h>
#endif
+#ifdef ORXONOX_PLATFORM_LINUX
+# include <dlfcn.h>
+#endif
+
#ifdef ORXONOX_PLATFORM_APPLE
-# include "macPlugins.h"
+# include <macPlugins.h>
#endif
namespace orxonox
Modified: code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h
===================================================================
--- code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h 2009-09-19 22:10:34 UTC (rev 5749)
+++ code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h 2009-09-20 10:06:22 UTC (rev 5750)
@@ -43,7 +43,7 @@
#include <tinyxml/ticpp.h> // 14
//#include <OgreOverlayelement.h> // 7, 7.2MB
-#include <bullet/linearmath/btMotionState.h> // 6
+#include <bullet/LinearMath/btMotionState.h> // 6
//#include <OgrePanelOverlayelement.h> // 5
///////////////////////////////////////////
More information about the Orxonox-commit
mailing list