added a buch of
#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:
parent
3a0c7e4a8a
commit
3531f874e0
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user