Some small updates.

[simgear.git] / simgear / screen / extensions.cxx

diff --git a/simgear/screen/extensions.cxx b/simgear/screen/extensions.cxx
index c16509f6fabe24e632f67727f6f3c52eda31a41b..21db7136409c915265aae8504bd0edb9c9eb47e7 100644 (file)
--- a/simgear/screen/extensions.cxx
+++ b/simgear/screen/extensions.cxx
@@ -25,8 +25,9 @@
 #include <string.h>
 
 #include "extensions.hxx"
+#include <simgear/debug/logstream.hxx>
 
-bool SGSearchExtensionsString(char *extString, char *extName) {
+static bool SGSearchExtensionsString(char *extString, char *extName) {
     // Returns GL_TRUE if the *extName string appears in the *extString string,
     // surrounded by white spaces, or GL_FALSE otherwise.
 
@@ -96,4 +97,30 @@ void* macosxGetGLProcAddress(const char *func) {
   return function;
 }
 
+#else if !defined( WIN32 )
+
+void *SGGetGLProcAddress(const char *func) {
+    static void *libHandle = NULL;
+    void *fptr = NULL;
+
+    /*
+     * Clear the error buffer
+     */
+    dlerror();
+
+    if (libHandle == NULL)
+        libHandle = dlopen("libGL.so", RTLD_LAZY);
+
+    if (libHandle != NULL) {
+        fptr = dlsym(libHandle, func);
+
+        char *error = dlerror();
+        if (error)
+            SG_LOG(SG_GENERAL, SG_INFO, error);
+    }
+
+    return fptr;
+}
+
 #endif
+