Adapt to GlueGen commit cc76889a6fe96cffb91c9a3aa7934878c0ecd97e: Use ClassLoader to find JNI native libraries

3 files changed, 3 insertions, 3 deletions

diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
index be41ad719..99bc71c4a 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
@@ -46,7 +46,7 @@ public class NWJNILibLoader extends JNILibLoaderBase {
         if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
             addNativeJarLibs(NWJNILibLoader.class, "jogl-all", new String[] { "nativewindow" } );
         }
-        return new Boolean(loadLibrary(libName, false));
+        return new Boolean(loadLibrary(libName, false, NWJNILibLoader.class.getClassLoader()));
       }
     }).booleanValue();
   }
diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java
index 354bb83e3..2377c2be6 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java
@@ -62,7 +62,7 @@ public class JAWTJNILibLoader extends NWJNILibLoader {
         // default library path
         if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) {
             try {
-                loadLibrary("jawt", null, true);
+                loadLibrary("jawt", null, true, JAWTJNILibLoader.class.getClassLoader());
             } catch (Throwable t) {
                 // It might be ok .. if it's already loaded
                 if(DEBUG) {
diff --git a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
index 78707e7cf..2db9d8d05 100644
--- a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
+++ b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
@@ -56,7 +56,7 @@ public class NEWTJNILibLoader extends JNILibLoaderBase {
         if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
             addNativeJarLibs(NEWTJNILibLoader.class, "jogl-all", new String[] { "nativewindow", "newt" } );
         }
-        loadLibrary(libName, false);
+        loadLibrary(libName, false, NEWTJNILibLoader.class.getClassLoader());
         return null;
       }
     });