Changeset 20907

Timestamp:

11/08/07 21:03:07 (1 year ago)

Author:

patrick

Message:

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

Files:

• juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/ExtensionLoader.cpp (modified) (6 diffs)

juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/ExtensionLoader.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/OpenGL/ExtensionLoader.h>
-
@@ -60 +61 @@
-   VoidExtFunc found_func(NULL);
-
-
+
+
+
-   if ( NSIsSymbolNameDefined(name) )
-   {
@@ -69 +72 @@
-      }
-   }
-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) || \
-      defined(VPR_OS_Linux) || defined(VPR_OS_FreeBSD) || \
-
+ || defined(VPR_OS_Darwin)
-
-   // Workaround for multiple nVidia/Linux installation bugs, based on code in
@@ -94 +98 @@
-   }
-
+   // We only have glX*() functions when we are using X11.
+#if defined(VRJ_USE_X11)
-   if (__GetProcAddress == NULL)
-   {
@@ -127 +133 @@
-      }
-   }
+#endif
-
-   if ( __GetProcAddress != NULL )