rename GL/glew to CustomGL/glew.h to avoid clashes with system glew

This commit is contained in:
erwincoumans
2015-04-16 15:29:39 -07:00
parent 57d8567ca3
commit b33d17f91c
10 changed files with 9 additions and 11 deletions

View File

@@ -7,8 +7,6 @@
#ifdef __APPLE__
#include "OpenGLWindow/MacOpenGLWindow.h"
#else
#include "GL/glew.h"
#ifdef _WIN32
#include "../OpenGLWindow/Win32OpenGLWindow.h"
#else

View File

@@ -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>

View File

@@ -31,7 +31,7 @@ subject to the following restrictions:
#endif
#else
#include "GL/glew.h"
#include "CustomGL/glew.h"
#ifdef _WINDOWS
#include <windows.h>

View File

@@ -13,7 +13,7 @@
#include "MacOpenGLWindow.h"
#else
#include "GL/glew.h"
//#include "GL/glew.h"
#ifdef _WIN32
#include "Win32OpenGLWindow.h"

View File

@@ -4,8 +4,8 @@
#include "MacOpenGLWindow.h"
#else
#include "GL/glew.h"
//#include "GL/glew.h"
#ifdef _WIN32
#include "Win32OpenGLWindow.h"
#else

View File

@@ -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

View File

@@ -5,7 +5,7 @@
#include "Gwen/Texture.h"
#include <math.h>
#include "GL/glew.h"
#include "../OpenGLWindow/OpenGLInclude.h"
#include "FontData.h"