de-Windownizing and some build-fixes

CMakeLists.txt

@@ -166,6 +166,19 @@ set(OENGINE_GUI
   ${LIBDIR}/openengine/gui/manager.cpp
 )
 
+set(OENGINE_BULLET
+    ${LIBDIR}/openengine/bullet/btKinematicCharacterController.cpp
+    ${LIBDIR}/openengine/bullet/btKinematicCharacterController.h
+    ${LIBDIR}/openengine/bullet/BtOgre.cpp
+    ${LIBDIR}/openengine/bullet/BtOgreExtras.h
+    ${LIBDIR}/openengine/bullet/BtOgreGP.h
+    ${LIBDIR}/openengine/bullet/BtOgrePG.h
+    ${LIBDIR}/openengine/bullet/CMotionState.cpp
+    ${LIBDIR}/openengine/bullet/CMotionState.h
+    ${LIBDIR}/openengine/bullet/physic.cpp
+    ${LIBDIR}/openengine/bullet/physic.hpp
+)
+
 # Sound setup
 if (USE_AUDIERE)
     set(MANGLE_SOUND_OUTPUT
@@ -206,7 +219,7 @@ set(OENGINE_SOUND
   ${LIBDIR}/mangle/sound/outputs/openal_out.cpp
   ${MANGLE_SOUND_OUTPUT}
 )
-set(OENGINE_ALL ${OENGINE_OGRE} ${OENGINE_GUI} ${OENGINE_SOUND})
+set(OENGINE_ALL ${OENGINE_OGRE} ${OENGINE_GUI} ${OENGINE_SOUND} ${OENGINE_BULLET})
 source_group(libs\\openengine FILES ${OENGINE_ALL})
 
 set(OPENMW_LIBS ${MANGLE_ALL} ${OENGINE_ALL})

apps/openmw/mwrender/mwscene.hpp

@@ -3,7 +3,7 @@
 
 #include <utility>
 #include <openengine/ogre/renderer.hpp>
-#include <openengine\bullet\physic.hpp>
+#include <openengine/bullet/physic.hpp>
 
 #include <vector>
 #include <string>

apps/openmw/mwworld/world.hpp

@@ -14,7 +14,7 @@
 #include "ptr.hpp"
 #include "globals.hpp"
 
-#include "openengine\bullet\physic.hpp"
+#include <openengine/bullet/physic.hpp>
 
 namespace Ogre
 {

components/nifbullet/bullet_nif_loader.hpp

@@ -29,8 +29,8 @@
 #include <OgreMesh.h>
 #include <assert.h>
 #include <string>
-#include <BulletCollision\CollisionShapes\btBvhTriangleMeshShape.h>
-#include <BulletCollision\CollisionShapes\btConvexTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h>
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
 

libs/openengine

@@ -1 +1 @@
-Subproject commit 7185eab18c29a0a5e03e44690d6bd8ece7e3792b
+Subproject commit 6c1338821e6bf640a0d54f36effc943aa4d86c6a