Merge pull request #1669 from erwincoumans/master

fix some incompatibilities between google3/third_party/GL,EGL, glad

examples/OpenGLWindow/EGLOpenGLWindow.cpp

@@ -38,7 +38,7 @@
 
 #include "OpenGLInclude.h"
 
-#include "third_party/GL/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/egl.h"
 #include "third_party/GL/gl/include/EGL/eglext.h"
 #include "third_party/GL/gl/include/GL/gl.h"
 

examples/OpenGLWindow/OpenGL2Include.h

@@ -17,12 +17,20 @@ subject to the following restrictions:
 #ifndef __OPENGL_INCLUDE_H
 #define __OPENGL_INCLUDE_H
 
+#ifdef BT_NO_GLAD
+#include "third_party/GL/gl/include/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/eglext.h"
+#include "third_party/GL/gl/include/GL/gl.h"
+#else
+
 #ifdef B3_USE_GLFW
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #else
 #include "glad/glad.h"
 #endif //B3_USE_GLFW
+#endif //BT_NO_GLAD
+
 //disable glGetError
 //#undef glGetError
 //#define glGetError MyGetError

examples/OpenGLWindow/OpenGLInclude.h

@@ -17,12 +17,17 @@ subject to the following restrictions:
 #ifndef __OPENGL_INCLUDE_H
 #define __OPENGL_INCLUDE_H
 
+#ifdef BT_NO_GLAD
+#include "third_party/GL/gl/include/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/eglext.h"
+#include "third_party/GL/gl/include/GL/gl.h"
+#else
 #ifdef B3_USE_GLFW
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #else
 #include "glad/glad.h"
 #endif //B3_USE_GLFW
-
+#endif //BT_NO_GLAD
 #endif //__OPENGL_INCLUDE_H
 

examples/OpenGLWindow/X11OpenGLWindow.cpp

@@ -6,11 +6,6 @@
 
 #include<stdio.h>
 #include<stdlib.h>
-#ifdef GLEW_STATIC
-#include "glad/glad.h"
-#else
-#include <GL/glew.h>
-#endif//GLEW_STATIC
 
 #ifdef GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 #include "glad/glad_glx.h"

examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp

@@ -22,7 +22,13 @@
 #include "third_party/GL/gl/include/GL/gl.h"
 #include "third_party/GL/gl/include/GL/glext.h"
 #else
+
+#ifdef BT_NO_GLAD
 #include <GL/glew.h>
+#else
+#include "glad/glad.h"
+#endif
+
 #endif //NO_GLEW
 #endif //GLEW_STATIC
 #endif//(__APPLE__)