Tweaks I needed to get blender compiling on my new macbook running leopard.
authorKent Mein <mein@cs.umn.edu>
Mon, 5 Nov 2007 17:27:11 +0000 (17:27 +0000)
committerKent Mein <mein@cs.umn.edu>
Mon, 5 Nov 2007 17:27:11 +0000 (17:27 +0000)
Kent

extern/bFTGL/src/FTVectoriser.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp

index bb133d025b4ae11202c85363fb0f1e531b98e74c..82dcb0c0f51e61adab87a0b2b12d351eda5f9019 100644 (file)
@@ -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)
index c8ed2dd6960c95eda0d024af23d10fb4b833a57e..26b00f02e7d1168a5ffaac97e6e9dddcdd1285dc 100644 (file)
@@ -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;