Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix OpenGL detection on Linux, and re-add TTF project to premake

Browse Source
This commit is contained in:
Erwin Coumans
2014-05-14 11:03:53 -07:00
parent 934df75ea6
commit 5c1fc2e3a4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build3/findOpenGLGlewGlut.lua
View File

@@ -1,6 +1,8 @@
function findOpenGL() function findOpenGL()
configuration{} configuration{}
if os.is("Linux") then if os.is("Linux") then
if os.isdir("/usr/include") and os.isfile("/usr/include/GL/gl.h") then return true
end
return false return false
end end
--assume OpenGL is available on Mac OSX, Windows etc --assume OpenGL is available on Mac OSX, Windows etc

2
build3/premake4.lua
View File

@@ -151,7 +151,7 @@ end
-- include "../demo/gpu_initialize" -- include "../demo/gpu_initialize"
-- include "../opencl/lds_bank_conflict" -- include "../opencl/lds_bank_conflict"
-- include "../opencl/reduce" -- include "../opencl/reduce"
-- include "../btgui/OpenGLTrueTypeFont" include "../btgui/OpenGLTrueTypeFont"
-- include "../btgui/OpenGLWindow" -- include "../btgui/OpenGLWindow"
-- include "../demo/ObjLoader" -- include "../demo/ObjLoader"
-- include "../test/b3DynamicBvhBroadphase" -- include "../test/b3DynamicBvhBroadphase"