[Java-game-lib-cvs] CVS: LWJGL/src/native/common extgl.c,1.5,1.6

[Gregory P. <gre...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6326/src/native/common

Modified Files:
	extgl.c 
Log Message:
Changes to support dynamic loads on the mac and finish the initial build

Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- extgl.c	30 Dec 2002 22:05:06 -0000	1.5
+++ extgl.c	1 Jan 2003 04:04:43 -0000	1.6
@@ -32,7 +32,7 @@
     http://www.uni-karlsruhe.de/~uli2/
 
 */                         
-      
+
 #include "extgl.h"
 #include <stdio.h>
 #include <string.h>
@@ -1540,7 +1540,7 @@
 /*-----------------------------------------------------*/
 #ifdef _OSX
 
-int extgl_InitializeWGL()
+int extgl_InitializeAGL()
 {
     // add in AGL extensions here
 
@@ -3299,6 +3299,92 @@
         aglDellocEntryPoints();
 #endif 
 }
+
+#ifdef _OSX
+CFBundleRef gBundleRefOpenGL = NULL;
+// -------------------------
+OSStatus aglInitEntryPoints (void)
+{
+    OSStatus err = noErr;
+    const Str255 frameworkName = "\pOpenGL.framework";
+    FSRefParam fileRefParam;
+    FSRef fileRef;
+    CFURLRef bundleURLOpenGL;
+    memset(&fileRefParam, 0, sizeof(fileRefParam));
+    memset(&fileRef, 0, sizeof(fileRef));
+    fileRefParam.ioNamePtr  = frameworkName;
+    fileRefParam.newRef = &fileRef;
+
+    // Frameworks directory/folder
+    //
+    err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID);
+    if (noErr != err)
+    {
+        DebugStr ("\pCould not find frameworks folder");
+        return err;
+    }
+
+    // make FSRef for folder
+    //
+    err = PBMakeFSRefSync (&fileRefParam);
+
+
+    if (noErr != err)
+    {
+        DebugStr ("\pCould make FSref to frameworks folder");
+        return err;
+    }
+
+    // create URL to folder
+    //
+    bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef);
+    if (!bundleURLOpenGL)
+    {
+        DebugStr ("\pCould create OpenGL Framework bundle URL");
+        return paramErr;
+    }
+
+    // create ref to GL's bundle
+    //
+    gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,bundleURLOpenGL);
+    if (!gBundleRefOpenGL)
+    {
+        DebugStr ("\pCould not create OpenGL Framework bundle");
+        return paramErr;
+    }
+
+    // release created bundle
+    //
+    CFRelease (bundleURLOpenGL);
+
+    // if the code was successfully loaded, look for our function.
+    if (!CFBundleLoadExecutable (gBundleRefOpenGL))
+    {
+        DebugStr ("\pCould not load MachO executable");
+        return paramErr;
+    }
+
+    return err;
+}
+
+
+void aglDellocEntryPoints (void)
+{
+    if (gBundleRefOpenGL != NULL)
+    {
+        // unload the bundle's code.
+        CFBundleUnloadExecutable (gBundleRefOpenGL);
+        CFRelease (gBundleRefOpenGL);
+        gBundleRefOpenGL = NULL;
+    }
+}
+
+
+void * aglGetProcAddress (char * pszProc)
+{
+    return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,CFStringCreateWithCStringNoCopy (NULL, pszProc, CFStringGetSystemEncoding (), NULL));
+}
+#endif
 
 /* turn on the warning for the borland compiler*/
 #ifdef __BORLANDC__