mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-05 01:50:05 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
f5cdd6e015
@ -59,6 +59,22 @@
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function initX11()
|
||||||
|
if os.is("Linux") then
|
||||||
|
if _OPTIONS["enable_system_x11"] and (os.isdir("/usr/include") and os.isfile("/usr/include/X11/X.h")) then
|
||||||
|
links{"X11","pthread"}
|
||||||
|
else
|
||||||
|
print("No X11/X.h found, using dynamic loading of X11")
|
||||||
|
includedirs {
|
||||||
|
projectRootDir .. "examples/ThirdPartyLibs/optionalX11"
|
||||||
|
}
|
||||||
|
defines {"DYNAMIC_LOAD_X11_FUNCTIONS"}
|
||||||
|
links {"dl","pthread"}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
function initGlew()
|
function initGlew()
|
||||||
configuration {}
|
configuration {}
|
||||||
if os.is("Windows") then
|
if os.is("Windows") then
|
||||||
|
Loading…
Reference in New Issue
Block a user