From 137e58ba482e20822ff313716e0d2d9d56587dd9 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 4 May 2012 05:29:27 +0200 Subject: Adapt to GlueGen commit cc76889a6fe96cffb91c9a3aa7934878c0ecd97e: Use ClassLoader to find JNI native libraries --- src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java | 2 +- src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTJNILibLoader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nativewindow/classes/jogamp') 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) { -- cgit v1.2.3