Modified Files:

	simgear/screen/extensions.cxx simgear/screen/extensions.hxx:
	use glXGetProcAddress if approriate

diff --git a/simgear/screen/extensions.cxx b/simgear/screen/extensions.cxx
index a317bda42fec5d4c996a24f8dc561de627900323..491618123389babf8000d7915c1c12ff01298769 100644 (file)
--- a/simgear/screen/extensions.cxx
+++ b/simgear/screen/extensions.cxx
@@ -26,6 +26,9 @@
 
 #include "extensions.hxx"
 #include <simgear/debug/logstream.hxx>
+#if !defined(WIN32) && !defined( GLX_VERSION_1_4 )
+#  include <dlfcn.h>
+#endif
 
 bool SGSearchExtensionsString(const char *extString, const char *extName) {
     // Returns GL_TRUE if the *extName string appears in the *extString string,
@@ -96,7 +99,7 @@ void* macosxGetGLProcAddress(const char *func) {
   return function;
 }
 
-#elif !defined( WIN32 )
+#elif !defined( WIN32 ) && !defined(GLX_VERSION_1_4)
 
 void *SGGetGLProcAddress(const char *func) {
     static void *libHandle = NULL;

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index aa5dd3c7626c6472c34a6e4222bf559d69a4cfc4..fe40550a32e0903ad34d71fd0c9620f56e8f7ff2 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -33,7 +33,7 @@
 #endif
 
 #if !defined(WIN32)
-# include <dlfcn.h>
+# include <GL/glx.h>
 #endif
 
 #include <simgear/compiler.h>
@@ -56,7 +56,7 @@ bool SGIsOpenGLExtensionSupported(char *extName);
   // don't use an inline function for symbol lookup, since it is too big
   void* macosxGetGLProcAddress(const char *func);
 
-#elif !defined( WIN32 )
+#elif !defined( WIN32 ) && !defined( GLX_VERSION_1_4 )
 
   void *SGGetGLProcAddress(const char *func);
   
@@ -70,8 +70,10 @@ inline void (*SGLookupFunction(const char *func))()
 #elif defined( __APPLE__ )
     return (void (*)()) macosxGetGLProcAddress(func);
 
-#else // UNIX
+#elif defined( GLX_VERSION_1_4 )
+    return glXGetProcAddress((const GLubyte*)func);
 
+#else // UNIX, default
     return (void (*)()) SGGetGLProcAddress(func);
 #endif
 }