From 3d499c8a7a4625426bb67514db97b7725e1f52bd Mon Sep 17 00:00:00 2001
From: a <a>
Date: Mon, 5 Mar 2018 23:05:22 +0100
Subject: 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
---
 build3/findOpenGLGlewGlut.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'build3')

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
-- 
cgit v1.2.1