archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

added a buch of

Browse Source 
#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)
This commit is contained in:
Stefan Gartner
2003-01-07 00:18:59 +00:00
parent 3a0c7e4a8a
commit 3531f874e0
8 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/include/BIF_gl.h
View File

@@ -34,9 +34,13 @@
#ifndef BIF_GL_H #ifndef BIF_GL_H
#define BIF_GL_H #define BIF_GL_H
#ifdef __APPLE__
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#endif
/* /*
* these should be phased out. cpack should be replaced in * these should be phased out. cpack should be replaced in
* code with calls to glColor3ub, lrectwrite probably should * code with calls to glColor3ub, lrectwrite probably should

4
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
View File

@@ -35,7 +35,11 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif
#include "RAS_ICanvas.h" #include "RAS_ICanvas.h"
#include "RAS_Rect.h" #include "RAS_Rect.h"

5
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
View File

@@ -74,8 +74,11 @@ extern "C" {
/* end of blender block */ /* end of blender block */
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif
void BL_warp_pointer(int x,int y) void BL_warp_pointer(int x,int y)

6
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
View File

@@ -39,7 +39,11 @@
// OpenGL gl.h needs 'windows.h' on windows platforms // OpenGL gl.h needs 'windows.h' on windows platforms
#include <windows.h> #include <windows.h>
#endif //WIN32 #endif //WIN32
#include "GL/gl.h" #ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#include "RAS_IRenderTools.h" #include "RAS_IRenderTools.h"
#include "RAS_IRasterizer.h" #include "RAS_IRasterizer.h"

9
source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
View File

@@ -67,8 +67,13 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif // WIN32 #endif // WIN32
#include "GL/gl.h" #ifdef __APPLE__
#include "GL/glu.h" #include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>
#include <GL/glu.h>
#endif
static Image *fCurpage=0; static Image *fCurpage=0;
static int fCurtile=0, fCurmode=0, fCurTileXRep=0, fCurTileYRep=0; static int fCurtile=0, fCurmode=0, fCurTileXRep=0, fCurTileYRep=0;

4
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
View File

@@ -39,7 +39,11 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif
#include <iostream> #include <iostream>
#include "GPC_RenderTools.h" #include "GPC_RenderTools.h"

6
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_CheckVertexArrays.cpp
View File

@@ -38,7 +38,11 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif // WIN32 #endif // WIN32
#include "GL/gl.h" #ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#include "STR_String.h" #include "STR_String.h"

6
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@@ -7,7 +7,11 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif // WIN32 #endif // WIN32
#include "GL/gl.h" #ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#include "RAS_Rect.h" #include "RAS_Rect.h"
#include "RAS_TexVert.h" #include "RAS_TexVert.h"