From 14eab8af439e6e7ce7ee08a9ca13fec3f3a80d25 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 2 Sep 2013 21:01:10 +0200
Subject: Fix Bug 810: Adding Julien Gouesse's fix while moved the new
 'addNativeJarLibsJoglCfg(..)' to GlueGen, commit
 c0ead6fa10280f8076704726d59f482b183fd77e

---
 .../jogamp/nativewindow/NWJNILibLoader.java        | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 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 6c15f9a2b..1a106b1b9 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
@@ -36,21 +36,17 @@ import com.jogamp.common.jvm.JNILibLoaderBase;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.cache.TempJarCache;
 
-public class NWJNILibLoader extends JNILibLoaderBase {
-  
-  public static boolean loadNativeWindow(final String ossuffix) {
-    return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-      public Boolean run() {
-        Platform.initSingleton();
-        final String libName = "nativewindow_"+ossuffix ;
-        if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
-            // either: [jogl-all.jar, jogl-all-noawt.jar, jogl-all-mobile.jar] -> jogl-all-natives-<os.and.arch>.jar
-            // or:     nativewindow-core.jar                                   -> nativewindow-natives-<os.and.arch>.jar
-            addNativeJarLibs(new Class<?>[] { NWJNILibLoader.class }, "-all", new String[] { "-noawt", "-mobile", "-core" } );
-        }
-        return new Boolean(loadLibrary(libName, false, NWJNILibLoader.class.getClassLoader()));
-      }
-    }).booleanValue();
-  }
-
+public class NWJNILibLoader extends JNILibLoaderBase {  
+    public static boolean loadNativeWindow(final String ossuffix) {
+        return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+            public Boolean run() {
+                Platform.initSingleton();
+                final String libName = "nativewindow_"+ossuffix ;
+                if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
+                    JNILibLoaderBase.addNativeJarLibsJoglCfg(new Class<?>[] { NWJNILibLoader.class });
+                }
+                return Boolean.valueOf(loadLibrary(libName, false, NWJNILibLoader.class.getClassLoader()));
+            }
+        }).booleanValue();
+    }
 }
-- 
cgit v1.2.3