Adapt to gluegen commit 9a71703904ebfec343fb2c7266343d37a2e4c3dbv2.0-rc10

3 files changed, 8 insertions, 3 deletions

diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat
index c38b5b1..1a769ce 100755
--- a/make/scripts/make.joal.all.win32.bat
+++ b/make/scripts/make.joal.all.win32.bat
@@ -1,6 +1,8 @@
+set THISDIR="C:\JOGL"

+

 set J2RE_HOME=c:\jre1.6.0_30_x32

 set JAVA_HOME=c:\jdk1.6.0_30_x32

-set ANT_PATH=C:\apache-ant-1.8.0

+set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

 

diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat
index c23cb47..1d1b915 100755
--- a/make/scripts/make.joal.all.win64.bat
+++ b/make/scripts/make.joal.all.win64.bat
@@ -1,6 +1,8 @@
+set THISDIR="C:\JOGL"

+

 set J2RE_HOME=c:\jre1.6.0_30_x64

 set JAVA_HOME=c:\jdk1.6.0_30_x64

-set ANT_PATH=C:\apache-ant-1.8.0

+set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%

 

diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
index c060047..53aed12 100644
--- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
+++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java
@@ -47,7 +47,8 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo  {
                 Platform.initSingleton();
                 
                 if(TempJarCache.isInitialized()) {
-                   JNILibLoaderBase.addNativeJarLibs(ALDynamicLibraryBundleInfo.class, "joal", null);
+                   // only: joal.jar -> joal-natives-<os.and.arch>.jar
+                   JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { ALDynamicLibraryBundleInfo.class }, null, null );
                 }
                 return null;
             }