diff options
| author | a <a> | 2018-03-05 23:05:22 +0100 |
|---|---|---|
| committer | Max Argus <argus.max@gmail.com> | 2018-08-30 13:24:25 +0200 |
| commit | 3d499c8a7a4625426bb67514db97b7725e1f52bd (patch) | |
| tree | 91c237cf7f14ce7a98083a5b8949aa9b563a8acc /build3 | |
| parent | 4d00beefbbe2f2f2d60e61eeb241c11b631114f4 (diff) | |
| download | bullet3-3d499c8a7a4625426bb67514db97b7725e1f52bd.tar.gz | |
pybullet: added EGL render device and window_backend option.
EGL review.
EGL dynamic loading, windowType to int
moved to glad2
Require GL 3.3 as GLInstancingRenderer.cpp uses glVertexAttribDivisor
glad2 update with dynamic X11 added
removed old file
build fix
fix mac/win
EGL w/o c++11, off by default
fix premake
fixup: premake fix 2
Diffstat (limited to 'build3')
| -rw-r--r-- | build3/findOpenGLGlewGlut.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build3/findOpenGLGlewGlut.lua b/build3/findOpenGLGlewGlut.lua index 4e44e0556..5d53a25d9 100644 --- a/build3/findOpenGLGlewGlut.lua +++ b/build3/findOpenGLGlewGlut.lua @@ -52,13 +52,13 @@ includedirs { projectRootDir .. "examples/ThirdPartyLibs/glad" } - files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"} + files { projectRootDir .. "examples/ThirdPartyLibs/glad/gl.c"} end if os.is("MacOSX") then includedirs { projectRootDir .. "examples/ThirdPartyLibs/glad" } - files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"} + files { projectRootDir .. "examples/ThirdPartyLibs/glad/gl.c"} end if os.is("Linux") then @@ -70,7 +70,7 @@ print("Using glad_glx") defines { "GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"} files { - projectRootDir .. "examples/ThirdPartyLibs/glad/glad_glx.c"} + projectRootDir .. "examples/ThirdPartyLibs/glad/glx.c"} end print("Using glad and dynamic loading of GL functions") @@ -78,7 +78,8 @@ includedirs { projectRootDir .. "examples/ThirdPartyLibs/glad" } - files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"} + files { projectRootDir .. "examples/ThirdPartyLibs/glad/gl.c", + projectRootDir .. "examples/ThirdPartyLibs/glad/glx.c"} links {"dl"} end |