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

premake4 build: allow to dynamically load X11 if X11 system headers/library is missing

Browse Source 
premake4 build: allow to dynamically load OpenGL/GLEW/glx if system headers are missing
This commit is contained in:
Erwin Coumans
2014-08-18 21:43:08 -07:00
parent 670576ec72
commit bf1bd07636
40 changed files with 15811 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos3/AllBullet2Demos/premake4.lua
View File

@@ -79,7 +79,9 @@
"../GpuDemos/gwenUserInterface.h"
}
if os.is("Linux") then links{"X11","pthread"} end
if os.is("Linux") then
initX11()
end
if os.is("MacOSX") then
links{"Cocoa.framework"}
end

2
Demos3/BasicDemoCustomOpenGL2/premake4.lua
View File

@@ -32,7 +32,7 @@ project "App_BasicDemoCustomOpenGL2"
"../../Demos/OpenGL/GLDebugFont.cpp",
"../../Demos/OpenGL/GLDebugFont.h"
}
if os.is("Linux") then links{"X11","pthread"} end
if os.is("Linux") then initX11() end
if os.is("MacOSX") then
links{"Cocoa.framework"}

2
Demos3/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
if (OPENGL_FOUND)
if (BUILD_BULLET3_DEMOS)
SUBDIRS( AllBullet2Demos GpuDemos SimpleOpenGL3 )
endif(BUILD_BULLET3_DEMOS)
endif(OPENGL_FOUND)

2
Demos3/GpuDemos/premake4.lua
View File

@@ -91,7 +91,7 @@ function createProject(vendor)
}
end
if os.is("Linux") then
links{"X11","pthread"}
initX11()
files {
"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
"../../btgui/OpenGLWindow/X11OpenGLWindows.h"

2
Demos3/SimpleOpenGL3/premake4.lua
View File

@@ -27,7 +27,7 @@
}
if os.is("Linux") then links {"X11","pthread"} end
if os.is("Linux") then initX11() end
if os.is("MacOSX") then
links{"Cocoa.framework"}