added a buch of
authorStefan Gartner <stefang@aon.at>
Tue, 7 Jan 2003 00:18:59 +0000 (00:18 +0000)
committerStefan Gartner <stefang@aon.at>
Tue, 7 Jan 2003 00:18:59 +0000 (00:18 +0000)
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
(also for <GL/glu.h>)

so that people don't have to create symlinks in
/System/Library/Frameworks/OpenGL.framework on Mac OS X
(Charles Wardlaw)

source/blender/include/BIF_gl.h
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

index 291c465c6c6481e6c3873aa0e2b536bdb1680f38..98c6a93c56fa3aa9707a4e0940e02c424cdb61be 100644 (file)
 #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
index 5f8b7541f767799b990646ae817916deea9803d2..23258f5ea8102c6366294141bcaa6c7b88c108bd 100644 (file)
 #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"
index d8399fd335198066c3e7f3f9fab6246ec565d76c..92c2519c58324d46cf6d251c46cd847c78bbad37 100644 (file)
@@ -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)
index c9e86116052d76a6b502a4930b2f94480704658b..2049f2ecc616ee954d69a5a188b5f3136e01e870 100644 (file)
 // 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"
index 2741ba048c8dbaa5a244db0e85057b1ac36ca4b7..b43dfee60a0fded0536a51df66221b9c44988859 100644 (file)
 #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;
index 12212cfd182f3c3c24c1dd84b5126fd710046fb3..08db3719210857ba7102f0590f6769c480ae4712 100644 (file)
 #include <windows.h>
 #endif 
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #include <iostream>
 
 #include "GPC_RenderTools.h"
index 0a62acbec712667f6f461de8121e1eb870e67f7b..f3c5b8511121ffe111c77af3509bc592ee22825e 100644 (file)
 #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"
 
index 959b8ecc99f97358da4e96804ea5a605557efd88..b1c3e5b199631602968fcc6b83d95e6d84c625fa 100644 (file)
@@ -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"