Merge pull request #159 from xantares/master

Fix linux|mingw shared|static build
2014-04-09 11:14:58 -07:00
parent 6cc5311216 aafbf48130
commit be889f5eff
12 changed files with 32 additions and 10 deletions
--- a/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp
+++ b/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp
@@ -54,7 +54,7 @@ b3GpuDynamicsWorld::~b3GpuDynamicsWorld()
 }


-#include <Windows.h>
+#include <windows.h>

 int		b3GpuDynamicsWorld::stepSimulation( btScalar timeStepUnused, int maxSubStepsUnused, btScalar fixedTimeStep)
 {
--- a/Demos3/CpuDemos/main_opengl3core.cpp
+++ b/Demos3/CpuDemos/main_opengl3core.cpp
@@ -2,7 +2,7 @@
 //#include "GpuDemo.h"

 #ifdef _WIN32
-#include <Windows.h> //for GetLocalTime/GetSystemTime
+#include <windows.h> //for GetLocalTime/GetSystemTime
 #else
 #include <sys/time.h>//gettimeofday
 #endif
--- a/Demos3/GpuDemos/main_opengl3core.cpp
+++ b/Demos3/GpuDemos/main_opengl3core.cpp
@@ -2,7 +2,7 @@
 //#include "GpuDemo.h"

 #ifdef _WIN32
-#include <Windows.h> //for GetLocalTime/GetSystemTime
+#include <windows.h> //for GetLocalTime/GetSystemTime
 #else
 #include <sys/time.h>//gettimeofday
 #endif