From a393e45613d87101dbb13763df263c2f9291d2d0 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 26 Jun 2012 10:44:08 +0200
Subject: Implement Bug #598 - JOGL ALL JAR File Change incl. it's Native Jar
 URL Derivation

- Depends on GlueGen commit 9a71703904ebfec343fb2c7266343d37a2e4c3db

JAR file name changes:

ALL JARs:
 - jogl.all.jar                -> jogl-all.jar
 - jogl.all-noawt.jar          -> jogl-all-noawt.jar
 - jogl.all-mobile.jar         -> jogl-all-mobile.jar
 - jogl.all-android.jar        -> jogl-all-android.jar
 - jogl.all-android.apk        -> jogl-all-android.apk

Atomic JARs:
-  nativewindow.core.jar       -> nativewindow-core.jar
-  nativewindow.awt.jar        -> nativewindow-awt.jar
-  nativewindow.os.x11.jar     -> nativewindow-os-x11.jar
-  nativewindow.os.win.jar     -> nativewindow-os-win.jar
-  nativewindow.os.macosx.jar  -> nativewindow-os-osx.jar

-  jogl.core.jar               -> jogl-core.jar
-  jogl.sdk.jar                -> jogl-sdk.jar
-  jogl.glmobile.jar           -> jogl-glmobile.jar
-  jogl.glmobile.dbg.jar       -> jogl-glmobile-dbg.jar
-  jogl.util.jar               -> jogl-util.jar
-  jogl.glutess.jar            -> jogl-glutess.jar
-  jogl.glumipmap.jar          -> jogl-glumipmap.jar
-  jogl.util.fixedfuncemu.jar  -> jogl-util-fixedfuncemu.jar
-  jogl.awt.jar                -> jogl-awt.jar
-  jogl.swt.jar                -> jogl-swt.jar
-  jogl.util.awt.jar           -> jogl-util-awt.jar
-  jogl.os.x11.jar             -> jogl-os-x11.jar
-  jogl.os.win.jar             -> jogl-os-win.jar
-  jogl.os.osx.jar             -> jogl-os-osx.jar
-  jogl.os.android.jar         -> jogl-os-android.jar
-  jogl.gldesktop.jar          -> jogl-gldesktop.jar
-  jogl.gldesktop.dbg.jar      -> jogl-gldesktop-dbg.jar
-  jogl.glugldesktop.jar       -> jogl-glu-gldesktop.jar
-  jogl.util.gldesktop.jar     -> jogl-util-gldesktop.jar
-  jogl.omx.jar                -> jogl-omx.jar
-  jogl.cg.jar                 -> jogl-cg.jar

-  newt.core.jar               -> newt-core.jar
-  newt.ogl.jar                -> newt-ogl.jar
-  newt.awt.jar                -> newt-awt.jar
-  newt.event.jar              -> newt-event.jar
-  newt.driver.x11.jar         -> newt-driver-x11.jar
-  newt.driver.win.jar         -> newt-driver-win.jar
-  newt.driver.macosx.jar      -> newt-driver-osx.jar
-  newt.driver.android.jar     -> newt-driver-android.jar
-  newt.driver.kd.jar          -> newt-driver-kd.jar
-  newt.driver.intelgdl.jar    -> newt-driver-intelgdl.jar
-  newt.driver.broadcomegl.jar -> newt-driver-broadcomegl.jar

Test JARs:
 - jogl.test.jar               -> jogl-test.jar
 - jogl.test-android.jar       -> jogl-test-android.jar
 - jogl.test-android.apk       -> jogl-test-android.apk
---
 src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/nativewindow')

diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
index 99bc71c4a..6c15f9a2b 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
@@ -44,7 +44,9 @@ public class NWJNILibLoader extends JNILibLoaderBase {
         Platform.initSingleton();
         final String libName = "nativewindow_"+ossuffix ;
         if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
-            addNativeJarLibs(NWJNILibLoader.class, "jogl-all", new String[] { "nativewindow" } );
+            // 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()));
       }
-- 
cgit v1.2.3