dynamic load of jawt.dll/.so also

no more dyn. linkage to libglx.so

2 files changed, 1 insertions, 52 deletions

diff --git a/CNativeCode/gltool.c b/CNativeCode/gltool.c
index d61e19a..695c0da 100755
--- a/CNativeCode/gltool.c
+++ b/CNativeCode/gltool.c
@@ -40,7 +40,6 @@ static int _glLibsLoaded = 0;
 #endif
 
 #ifdef _X11_
-  static void *libHandleGLX=0;
   static void *libHandleGL=0;
   static void *libHandleGLU=0;
 #endif
@@ -165,11 +164,6 @@ int LIBAPIENTRY unloadGLLibrary ()
 	      dlclose (libHandleGLU);
 	      libHandleGLU = NULL;
       }
-      if(libHandleGLX!=NULL)
-      {
-	      dlclose (libHandleGLX);
-	      libHandleGLX = NULL;
-      }
 #endif
 
 #ifdef _MAC_OS9_
@@ -256,14 +250,6 @@ int LIBAPIENTRY loadGLLibrary (const char * libGLName, const char * libGLUName,
       return 0;
   }
 
-  libHandleGLX = dlopen ("libglx.so", RTLD_LAZY | RTLD_GLOBAL);
-  if (libHandleGLX == NULL)
-  {
-      if(verbose)
-	      printf ("GLINFO: cannot access GLX library libglx.so directly ...\n");
-      fflush (NULL);
-  }
-
 #endif
 
 #ifdef _MAC_OS9_
@@ -397,43 +383,6 @@ void * LIBAPIENTRY getGLProcAddressHelper
 	printf
 	  ("GLINFO: cannot find glXGetProcAddress* in OpenGL library %s\n", libGLName);
 	fflush (NULL);
-	if (libHandleGLX != NULL)
-	{
-	  disp__glXGetProcAddress = dlsym (libHandleGLX, "glXGetProcAddressARB");
-
-	  if (disp__glXGetProcAddress != NULL && verbose)
-	  {
-	    printf ("GLINFO: found glXGetProcAddressARB in libglx.so\n");
-	    fflush (NULL);
-	  }
-
-	  if (disp__glXGetProcAddress == NULL)
-	  {
-	    disp__glXGetProcAddress = dlsym (libHandleGLX, "glXGetProcAddressEXT");
-
-	    if (disp__glXGetProcAddress != NULL && verbose)
-	    {
-	      printf ("GLINFO: found glXGetProcAddressEXT in libglx.so\n");
-	      fflush (NULL);
-	    }
-	  }
-
-	  if (disp__glXGetProcAddress == NULL)
-	  {
-	    disp__glXGetProcAddress = dlsym (libHandleGLX, "glXGetProcAddress");
-
-	    if (disp__glXGetProcAddress != NULL && verbose)
-	    {
-	      printf ("GLINFO: found glXGetProcAddress in libglx.so\n");
-	      fflush (NULL);
-	    }
-	  }
-	  if (disp__glXGetProcAddress == NULL)
-	  {
-	    printf ("GLINFO: cannot find glXGetProcAddress* in GLX library libglx.so\n");
-	    fflush (NULL);
-	  }
-	}
       }
   }
   __firstAccess = 0;
diff --git a/CNativeCode/jawt_misc.c b/CNativeCode/jawt_misc.c
index bdf8fe7..4f083d7 100644
--- a/CNativeCode/jawt_misc.c
+++ b/CNativeCode/jawt_misc.c
@@ -95,7 +95,7 @@ jawt_unload ()
   if ( libHandleJAWT != NULL )
   {
 	  JAWT_GetAWT_fn = NULL;
-	  dlClose(libHandleJAWT);
+	  dlclose(libHandleJAWT);
 	  libHandleJAWT = NULL;
   }