[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12481] trunk/blender: Tweaks I needed to get blender compiling on my new macbook running leopard .

[Kent Mein]

Revision: 12481
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12481
Author:   sirdude
Date:     2007-11-05 18:27:11 +0100 (Mon, 05 Nov 2007)

Log Message:
-----------
Tweaks I needed to get blender compiling on my new macbook running leopard.

Kent

Modified Paths:
--------------
    trunk/blender/extern/bFTGL/src/FTVectoriser.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp

Modified: trunk/blender/extern/bFTGL/src/FTVectoriser.cpp
===================================================================
--- trunk/blender/extern/bFTGL/src/FTVectoriser.cpp	2007-11-05 16:46:48 UTC (rev 12480)
+++ trunk/blender/extern/bFTGL/src/FTVectoriser.cpp	2007-11-05 17:27:11 UTC (rev 12481)
@@ -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)

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	2007-11-05 16:46:48 UTC (rev 12480)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	2007-11-05 17:27:11 UTC (rev 12481)
@@ -108,7 +108,7 @@
 
     // 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;