diff options
8 files changed, 39 insertions, 7 deletions
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h index 291c465c6c6..98c6a93c56f 100644 --- a/source/blender/include/BIF_gl.h +++ b/source/blender/include/BIF_gl.h @@ -34,9 +34,13 @@ #ifndef BIF_GL_H #define BIF_GL_H +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#else #include <GL/gl.h> #include <GL/glu.h> - +#endif /* * these should be phased out. cpack should be replaced in * code with calls to glColor3ub, lrectwrite probably should diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h index 5f8b7541f76..23258f5ea81 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h @@ -35,7 +35,11 @@ #ifdef WIN32 #include <windows.h> #endif +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else #include <GL/gl.h> +#endif #include "RAS_ICanvas.h" #include "RAS_Rect.h" diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index d8399fd3351..92c2519c583 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -74,8 +74,11 @@ extern "C" { /* end of blender block */ - +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else #include <GL/gl.h> +#endif void BL_warp_pointer(int x,int y) diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index c9e86116052..2049f2ecc61 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -39,7 +39,11 @@ // OpenGL gl.h needs 'windows.h' on windows platforms #include <windows.h> #endif //WIN32 -#include "GL/gl.h" +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else +#include <GL/gl.h> +#endif #include "RAS_IRenderTools.h" #include "RAS_IRasterizer.h" diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index 2741ba048c8..b43dfee60a0 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -67,8 +67,13 @@ #ifdef WIN32 #include <windows.h> #endif // WIN32 -#include "GL/gl.h" -#include "GL/glu.h" +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#else +#include <GL/gl.h> +#include <GL/glu.h> +#endif static Image *fCurpage=0; static int fCurtile=0, fCurmode=0, fCurTileXRep=0, fCurTileYRep=0; diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 12212cfd182..08db3719210 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -39,7 +39,11 @@ #include <windows.h> #endif +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else #include <GL/gl.h> +#endif #include <iostream> #include "GPC_RenderTools.h" diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp index 0a62acbec71..f3c5b851112 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp @@ -38,7 +38,11 @@ #ifdef WIN32 #include <windows.h> #endif // WIN32 -#include "GL/gl.h" +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else +#include <GL/gl.h> +#endif #include "STR_String.h" diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 959b8ecc99f..b1c3e5b1996 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -7,7 +7,11 @@ #ifdef WIN32 #include <windows.h> #endif // WIN32 -#include "GL/gl.h" +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#else +#include <GL/gl.h> +#endif #include "RAS_Rect.h" #include "RAS_TexVert.h" |