From a1b4e9acb011f41698775f1fee0041e88d09613f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 24 Sep 2011 03:25:53 +0200 Subject: Use new JNILIbLoaderBase addNativeJarLibs(all, atomic) for JOGL, NativeWindow and NEWT; no more LD_LIB_.. in setenv.sh for test scripts --- src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (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 d4ba27353..2b6d3c016 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java +++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java @@ -31,14 +31,20 @@ package jogamp.nativewindow; import java.security.AccessController; import java.security.PrivilegedAction; + import com.jogamp.common.jvm.JNILibLoaderBase; +import com.jogamp.common.util.cache.TempJarCache; public class NWJNILibLoader extends JNILibLoaderBase { public static void loadNativeWindow(final String ossuffix) { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("nativewindow_"+ossuffix, false); + final String libName = "nativewindow_"+ossuffix ; + if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) { + addNativeJarLibs(NWJNILibLoader.class, "jogl.all", "jogl-all", new String[] { "nativewindow" } ); + } + loadLibrary(libName, false); return null; } }); -- cgit v1.2.3