Collision flag CF_DISABLE_SPU_COLLISION_PROCESSING can be combined with other flags (avoids SPU/parallel collision dispatch)

Fix for MinGW32 build

Demos/OpenGL/GLDebugFont.cpp

@@ -40,6 +40,7 @@ subject to the following restrictions:
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif
 #endif

Demos/OpenGL/GL_DialogWindow.h

@@ -33,11 +33,12 @@ class btCollisionObject;
 #else
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif
 #endif

Demos/OpenGL/GlutStuff.h

@@ -33,6 +33,7 @@ subject to the following restrictions:
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif //_WINDOWS
 #endif //APPLE

Demos/SharedOpenCL/btOclUtils.cpp

@@ -130,18 +130,11 @@ char* btOclLoadProgSource(const char* cFilename, const char* cPreamble, size_t*
     size_t szSourceLength;
 
     // open the OpenCL source code file
-    #ifdef _WIN32   // Windows version
-        if(fopen_s(&pFileStream, cFilename, "rb") != 0) 
-        {       
-            return NULL;
-        }
-    #else           // Linux version
-        pFileStream = fopen(cFilename, "rb");
-        if(pFileStream == 0) 
-        {       
-            return NULL;
-        }
-    #endif
+	pFileStream = fopen(cFilename, "rb");
+	if(pFileStream == 0) 
+	{       
+		return NULL;
+	}
 
     size_t szPreambleLength = strlen(cPreamble);
 

Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp

@@ -45,18 +45,11 @@ char* loadProgSource(const char* cFilename, const char* cPreamble, size_t* szFin
     size_t szSourceLength;
 	
     // open the OpenCL source code file
-#ifdef _WIN32   // Windows version
-	if(fopen_s(&pFileStream, cFilename, "rb") != 0) 
-	{       
-		return NULL;
-	}
-#else           // Linux version
 	pFileStream = fopen(cFilename, "rb");
 	if(pFileStream == 0) 
 	{       
 		return NULL;
 	}
-#endif
 	
     size_t szPreambleLength = strlen(cPreamble);