summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-30 18:00:22 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-30 18:00:22 +0300
commite8ee55ea0794dd985e73b26d3e889f6eda16bf3d (patch)
treed44f04ed7b3c30e35719b982631311f0e3c16b4f
parenta344b0036c91ae0b9591803a0e18356bf8f37697 (diff)
downloadplus-e8ee55ea0794dd985e73b26d3e889f6eda16bf3d.tar.gz
plus-e8ee55ea0794dd985e73b26d3e889f6eda16bf3d.tar.bz2
plus-e8ee55ea0794dd985e73b26d3e889f6eda16bf3d.tar.xz
plus-e8ee55ea0794dd985e73b26d3e889f6eda16bf3d.zip
Fix glext.h include for MacOSX.
-rw-r--r--src/render/mobileopengl2graphics.h6
-rw-r--r--src/render/mobileopenglgraphics.h6
-rw-r--r--src/render/modernopenglgraphics.h6
-rw-r--r--src/render/normalopenglgraphics.h6
-rw-r--r--src/render/nullopenglgraphics.h6
-rw-r--r--src/render/opengl/mgltypes.h4
-rw-r--r--src/render/safeopenglgraphics.h6
-rw-r--r--src/resources/fboinfo.h6
8 files changed, 32 insertions, 14 deletions
diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h
index ecd04cc89..d1b5b96a5 100644
--- a/src/render/mobileopengl2graphics.h
+++ b/src/render/mobileopengl2graphics.h
@@ -39,9 +39,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class OpenGLGraphicsVertexes;
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 7af81a4c8..7f14fc6f8 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -39,9 +39,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class OpenGLGraphicsVertexes;
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index 0c7d0d5c9..2776cc1fb 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -39,9 +39,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class OpenGLGraphicsVertexes;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 05014deed..8f6652775 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -39,9 +39,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class OpenGLGraphicsVertexes;
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index fb7cdc806..9d5229674 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -39,9 +39,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class OpenGLGraphicsVertexes;
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index cea84350b..96f86bde3 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -38,7 +38,11 @@
#ifdef __native_client__
#include <GL/Regal.h>
#else
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#else // defined(__APPLE__)
#include <GL/glext.h>
+#endif // defined(__APPLE__)
#endif
#endif
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 212c49e9d..f511db871 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -37,9 +37,11 @@
#define GL_GLEXT_PROTOTYPES 1
#endif
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
class SafeOpenGLGraphics final : public Graphics
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 1427b05af..c97e4eee8 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -30,9 +30,11 @@
#include <GLES/glext.h>
#else
#include <SDL_opengl.h>
-#ifndef __native_client__
+#if defined(__APPLE__)
+#include <OpenGL/glext.h>
+#elif !defined(__native_client__)
#include <GL/glext.h>
-#endif
+#endif // defined(__APPLE__)
#endif
struct FBOInfo final