Merge branch 'master' into master

This commit is contained in:
erwincoumans 2020-07-24 18:10:40 -07:00 committed by GitHub
commit f5cdd6e015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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