diff options
author | Kent Mein <mein@cs.umn.edu> | 2007-11-05 20:27:11 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2007-11-05 20:27:11 +0300 |
commit | 86278584f3fb28941705eff2f6a885e6ef06357c (patch) | |
tree | 718d01c7984bd559c4213c3901eaad4babc88eda | |
parent | 9c33c9522f8ba632e1eddf8c4a3ab8366d4b0722 (diff) |
Tweaks I needed to get blender compiling on my new macbook running leopard.
Kent
-rw-r--r-- | extern/bFTGL/src/FTVectoriser.cpp | 8 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/extern/bFTGL/src/FTVectoriser.cpp b/extern/bFTGL/src/FTVectoriser.cpp index bb133d025b4..82dcb0c0f51 100644 --- a/extern/bFTGL/src/FTVectoriser.cpp +++ b/extern/bFTGL/src/FTVectoriser.cpp @@ -5,8 +5,12 @@ #define CALLBACK #endif -#ifdef __APPLE_CC__ - typedef GLvoid (*GLUTesselatorFunction)(...); +#if defined(__APPLE_CC__) + #if __APPLE_CC__ >= 5465 + typedef GLvoid (*GLUTesselatorFunction)(); + #else + typedef GLvoid (*GLUTesselatorFunction)(...); + #endif #elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) typedef GLvoid (*GLUTesselatorFunction)(); #elif defined ( WIN32) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index c8ed2dd6960..26b00f02e7d 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -108,7 +108,7 @@ static OSStatus bglInitEntryPoints (void) // Frameworks directory/folder err = FindFolder (kSystemDomain, kFrameworksFolderType, false, - &fileRefParam.ioVRefNum, &fileRefParam.ioDirID); + &fileRefParam.ioVRefNum, (SInt32*)&fileRefParam.ioDirID); if (noErr != err) { DebugStr ((unsigned char *)"\pCould not find frameworks folder"); return err; |