From b33d17f91cc432695e0ac8a160fd043ad83346c1 Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Thu, 16 Apr 2015 15:29:39 -0700
Subject: [PATCH] rename GL/glew to CustomGL/glew.h to avoid clashes with
 system glew

---
 examples/ExampleBrowser/OpenGLExampleBrowser.cpp            | 2 --
 examples/OpenGLWindow/OpenGL2Include.h                      | 2 +-
 examples/OpenGLWindow/OpenGLInclude.h                       | 2 +-
 examples/OpenGLWindow/SimpleOpenGL2App.cpp                  | 2 +-
 examples/OpenGLWindow/SimpleOpenGL3App.cpp                  | 4 ++--
 examples/ThirdPartyLibs/Glew/{GL => CustomGL}/glew.h        | 0
 examples/ThirdPartyLibs/Glew/{GL => CustomGL}/glxew.h       | 0
 examples/ThirdPartyLibs/Glew/{GL => CustomGL}/wglew.h       | 0
 examples/ThirdPartyLibs/Glew/glew.c                         | 6 +++---
 examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp | 2 +-
 10 files changed, 9 insertions(+), 11 deletions(-)
 rename examples/ThirdPartyLibs/Glew/{GL => CustomGL}/glew.h (100%)
 rename examples/ThirdPartyLibs/Glew/{GL => CustomGL}/glxew.h (100%)
 rename examples/ThirdPartyLibs/Glew/{GL => CustomGL}/wglew.h (100%)

diff --git a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
index fdfd077b3..542dbbc2f 100644
--- a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
+++ b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp
@@ -7,8 +7,6 @@
 #ifdef __APPLE__
 #include "OpenGLWindow/MacOpenGLWindow.h"
 #else
-
-#include "GL/glew.h"
 #ifdef _WIN32
 #include "../OpenGLWindow/Win32OpenGLWindow.h"
 #else
diff --git a/examples/OpenGLWindow/OpenGL2Include.h b/examples/OpenGLWindow/OpenGL2Include.h
index 08dd970ee..d47a2d4a9 100644
--- a/examples/OpenGLWindow/OpenGL2Include.h
+++ b/examples/OpenGLWindow/OpenGL2Include.h
@@ -24,7 +24,7 @@ subject to the following restrictions:
 #include <OpenGL/gl.h>
 #else
 
-#include "GL/glew.h"
+#include "CustomGL/glew.h"
 
 #ifdef _WINDOWS
 #include <windows.h>
diff --git a/examples/OpenGLWindow/OpenGLInclude.h b/examples/OpenGLWindow/OpenGLInclude.h
index 976199b29..87b9fd175 100644
--- a/examples/OpenGLWindow/OpenGLInclude.h
+++ b/examples/OpenGLWindow/OpenGLInclude.h
@@ -31,7 +31,7 @@ subject to the following restrictions:
 #endif
 #else
 
-#include "GL/glew.h"
+#include "CustomGL/glew.h"
 
 #ifdef _WINDOWS
 #include <windows.h>
diff --git a/examples/OpenGLWindow/SimpleOpenGL2App.cpp b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
index 3e5f6f409..672a150f5 100644
--- a/examples/OpenGLWindow/SimpleOpenGL2App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
@@ -13,7 +13,7 @@
 #include "MacOpenGLWindow.h"
 #else
 
-#include "GL/glew.h"
+
 //#include "GL/glew.h"
 #ifdef _WIN32
 #include "Win32OpenGLWindow.h"
diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
index 568f9e7d7..4c5545f96 100644
--- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -4,8 +4,8 @@
 #include "MacOpenGLWindow.h"
 #else
 
-#include "GL/glew.h"
-//#include "GL/glew.h"
+
+
 #ifdef _WIN32
 #include "Win32OpenGLWindow.h"
 #else
diff --git a/examples/ThirdPartyLibs/Glew/GL/glew.h b/examples/ThirdPartyLibs/Glew/CustomGL/glew.h
similarity index 100%
rename from examples/ThirdPartyLibs/Glew/GL/glew.h
rename to examples/ThirdPartyLibs/Glew/CustomGL/glew.h
diff --git a/examples/ThirdPartyLibs/Glew/GL/glxew.h b/examples/ThirdPartyLibs/Glew/CustomGL/glxew.h
similarity index 100%
rename from examples/ThirdPartyLibs/Glew/GL/glxew.h
rename to examples/ThirdPartyLibs/Glew/CustomGL/glxew.h
diff --git a/examples/ThirdPartyLibs/Glew/GL/wglew.h b/examples/ThirdPartyLibs/Glew/CustomGL/wglew.h
similarity index 100%
rename from examples/ThirdPartyLibs/Glew/GL/wglew.h
rename to examples/ThirdPartyLibs/Glew/CustomGL/wglew.h
diff --git a/examples/ThirdPartyLibs/Glew/glew.c b/examples/ThirdPartyLibs/Glew/glew.c
index c90af794a..1be61489e 100644
--- a/examples/ThirdPartyLibs/Glew/glew.c
+++ b/examples/ThirdPartyLibs/Glew/glew.c
@@ -29,12 +29,12 @@
 ** THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "GL/glew.h"
+#include "CustomGL/glew.h"
 
 #if defined(_WIN32)
-#  include <GL/wglew.h>
+#  include <CustomGL/wglew.h>
 #elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
-#  include "GL/glxew.h"
+#  include "CustomGL/glxew.h"
 
 #ifdef GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 
diff --git a/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp b/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
index 6408117af..305bbba25 100644
--- a/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
+++ b/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
@@ -5,7 +5,7 @@
 #include "Gwen/Texture.h"
 
 #include <math.h>
-#include "GL/glew.h"
+#include "../OpenGLWindow/OpenGLInclude.h"
 
 #include "FontData.h"