Merge branch 'master' of https://github.com/erwincoumans/bullet3

build3/findOpenGLGlewGlut.lua

@@ -1,3 +1,4 @@
+
 	function findOpenGL()
 		configuration{}
 		if os.is("Linux") then
@@ -7,6 +8,22 @@
 		return true
 	end
 
+      function findOpenGL3()
+                configuration{}
+                if os.is("MacOSX") then
+                        local osversion = os.getversion()
+		--Mac OSX 10.9 and above supports OpenGL 3, below doesn't, so ...
+                        if osversion.majorversion > 10 or (osversion.majorversion == 10 and osversion.minorversion >=9) then
+                                return findOpenGL()
+                        else
+                                return false
+                        end
+                else
+                        return findOpenGL()
+                end
+        end
+
+
 	function initOpenGL()
 		configuration {}
 		configuration {"Windows"}

build3/premake4.lua

@@ -1,6 +1,12 @@
 
   solution "0_Bullet3Solution"
 
+	local osversion = os.getversion()
+		print(string.format(" %d.%d.%d (%s)", 
+   		osversion.majorversion, osversion.minorversion, osversion.revision,
+   		osversion.description))
+	
+
 	-- Multithreaded compiling
 	if _ACTION == "vs2010" or _ACTION=="vs2008" then
 		buildoptions { "/MP"  }
@@ -35,8 +41,8 @@
 
 	newoption
 	{
-		trigger = "bullet2gpu",
-		description = "Enable Bullet 2.x GPU using b3GpuDynamicsWorld bridge to Bullet 3.x"
+		trigger = "bullet2demos",
+		description = "Compile the Bullet 2 demos (Demo/Extra folder)"
 	}
 
 	newoption
@@ -113,13 +119,12 @@
 		include "../test/TestBullet3OpenCL"
 	end
 
-if findOpenGL() then
+if findOpenGL3() then
 	include "../Demos3/AllBullet2Demos"
 	include "../Demos3/GpuDemos"
 	include"../Demos3/BasicDemoConsole"
 	include"../Demos3/BasicDemoCustomOpenGL2"
-	
-	
+	include "../btgui/OpenGLTrueTypeFont"	
 	
 --	include "../Demos3/CpuDemos"
 --	include "../Demos3/Wavefront"
@@ -137,6 +142,7 @@ if findOpenGL() then
     include "../btgui/GwenOpenGLTest"
 end
 
+
 --		include "../demo/gpudemo"
 if _OPTIONS["midi"] then
                 include "../btgui/MidiTest"
@@ -169,7 +175,7 @@ end
 --		include "../demo/gpu_initialize"
 --		include "../opencl/lds_bank_conflict"
 --		include "../opencl/reduce"
-		include "../btgui/OpenGLTrueTypeFont"
+--		include "../btgui/OpenGLTrueTypeFont"
 --		include "../btgui/OpenGLWindow"
 --		include "../demo/ObjLoader"
 --		include "../test/b3DynamicBvhBroadphase"
@@ -180,7 +186,10 @@ end
 		include "../test/enet/client"
 	end
 
-
-	if _OPTIONS["bullet2gpu"] then
+	if _OPTIONS["bullet2demos"] then
+		include "../Extras"
+		if findOpenGL() then
+        		include "../Demos"
+		end
 	end