Changeset 20908

Timestamp:

11/08/07 21:05:28 (10 months ago)

Author:

patrick

Message:

MFT r20907: Use dlopen(3) on Mac OS X 10.4 and newer for symbol lookup.

Files:

• juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlExtensionLoader.cpp (modified) (6 diffs)

juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlExtensionLoader.cpp

@@ -28 +28 @@
-
-#include <vpr/vpr.h>
-#include <vpr/Util/Debug.h>
-
-#if defined(VPR_OS_Darwin) && defined(VRJ_USE_COCOA)
@@ -36 +35 @@
-#endif
-
-!defined(WIN32) && !defined(VPR_OS_Darwin
-
+defined(VRJ_USE_X11
+  
-#endif
-
-
-
-
-
+
+
+
+
+
-#endif
-
+#include <vpr/Util/Debug.h>
-#include <vrj/Draw/OGL/GlExtensionLoader.h>
-
@@ -56 +57 @@
-   VoidExtFunc found_func(NULL);
-
-
+
+
+
-   if (NSIsSymbolNameDefined(name))
-   {
@@ -65 +68 @@
-      }
-   }
-WIN32
+VPR_OS_Windows
-
-   found_func = (void(__cdecl*)(void)) wglGetProcAddress(name);
-
+   // On UNIX variants including Mac OS X 10.4 and newer, use dlopen(3).
-#elif defined(VPR_OS_IRIX) || defined(VPR_OS_HPUX) || \
-
+
+
-
-   /* Workaround for multiple nVidia/Linux installation bugs, based on code in OpenSG */      
@@ -87 +92 @@
-   }
-
+   // We only have glX*() functions when we are using X11.
+#if defined(VRJ_USE_X11)
-   if (__GetProcAddress == NULL)
-   {
@@ -111 +118 @@
-      }
-   }
+#endif
-
-   if (__GetProcAddress != NULL)