diff options
| author | erwincoumans <erwincoumans@google.com> | 2020-07-24 18:10:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 18:10:40 -0700 |
| commit | f5cdd6e015e59bb39e8bfbcd3a20f4f156581190 (patch) | |
| tree | 6e11bef805dc28fbd7321024d264d1827c4e8452 | |
| parent | 1e8f39b492b579a78ad9d275c7f46b0d3b298403 (diff) | |
| parent | 1685aae597e152431aa626a1af7ea15075981a1c (diff) | |
| download | bullet3-f5cdd6e015e59bb39e8bfbcd3a20f4f156581190.tar.gz | |
Merge branch 'master' into master
| -rw-r--r-- | build3/findOpenGLGlewGlut.lua | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/build3/findOpenGLGlewGlut.lua b/build3/findOpenGLGlewGlut.lua index 189f5f5cd..0a3eb4e59 100644 --- a/build3/findOpenGLGlewGlut.lua +++ b/build3/findOpenGLGlewGlut.lua @@ -59,6 +59,22 @@ 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() configuration {} if os.is("Windows") then |