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

Merge pull request #1574 from erwincoumans/master

Browse Source 
fix glx include
This commit is contained in:
erwincoumans
2018-02-22 09:41:01 -08:00
committed by GitHub
parent 90b34680b0 05b02d6b3e
commit 94bc897067
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build3/findOpenGLGlewGlut.lua
View File

@@ -63,13 +63,22 @@
if os.is("Linux") then
configuration{"Linux"}
print("Using glad and dynamic loading of glx functions")
defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
if _OPTIONS["enable_system_glx"] then --# and (os.isdir("/usr/include") and os.isfile("/usr/include/GL/glx.h")) then
links{"X11","pthread"}
print("Using system GL/glx.h")
else
print("Using glad_glx")
defines { "GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
files {
projectRootDir .. "examples/ThirdPartyLibs/glad/glad_glx.c"}
end
print("Using glad and dynamic loading of GL functions")
defines { "GLEW_STATIC"}
includedirs {
projectRootDir .. "examples/ThirdPartyLibs/glad"
}
files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c",
projectRootDir .. "examples/ThirdPartyLibs/glad/glad_glx.c"}
files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"}
links {"dl"}
end

6
build3/premake4.lua
View File

@@ -28,6 +28,12 @@
description = "Enable iOS target (requires xcode4)"
}
newoption
{
trigger = "enable_system_glx",
description = "Try to link against system glx instead of using glad_glx (default)"
}
newoption
{
trigger = "enable_system_opengl",