summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/build.xml2
-rwxr-xr-xsrc/classes/com/sun/opengl/util/JOGLAppletLauncher.java12
2 files changed, 8 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml
index 48924b932..b324ffa1d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1305,7 +1305,7 @@
includes="*/**" />
<delete dir="${jogl.dist.dir}/tmp" />
<!-- Apply Pack200 repacking to allow later compression by that mechanism -->
- <apply executable="pack200" >
+ <apply executable="pack200" verbose="true" >
<arg value="--repack" />
<fileset file="${jogl.dist.dir}/jogl.jar" />
</apply>
diff --git a/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java b/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
index a29b05ee6..ed0d9f296 100755
--- a/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
+++ b/src/classes/com/sun/opengl/util/JOGLAppletLauncher.java
@@ -169,11 +169,13 @@ public class JOGLAppletLauncher extends Applet {
}
private static final NativeLibInfo[] allNativeLibInfo = {
- new NativeLibInfo("win", null, "jogl-natives-win32.jar", "", ".dll"),
- new NativeLibInfo("mac", null, "jogl-natives-macosx.jar", "lib", ".jnilib"),
- new NativeLibInfo("linux", null, "jogl-natives-linux.jar", "lib", ".so"),
- new NativeLibInfo("sunos", "sparc", "jogl-natives-solsparc.jar", "lib", ".so"),
- new NativeLibInfo("sunos", "x86", "jogl-natives-solx86.jar", "lib", ".so")
+ new NativeLibInfo("win", "x86", "jogl-natives-windows-i586.jar", "", ".dll"),
+ new NativeLibInfo("mac", "ppc", "jogl-natives-macosx-ppc.jar", "lib", ".jnilib"),
+ new NativeLibInfo("mac", "i386", "jogl-natives-macosx-universal.jar", "lib", ".jnilib"),
+ new NativeLibInfo("linux", "i386", "jogl-natives-linux-i586.jar", "lib", ".so"),
+ new NativeLibInfo("linux", "x86", "jogl-natives-linux-i586.jar", "lib", ".so"),
+ new NativeLibInfo("sunos", "sparc", "jogl-natives-solaris-sparc.jar", "lib", ".so"),
+ new NativeLibInfo("sunos", "x86", "jogl-natives-solaris-i586.jar", "lib", ".so")
};
private NativeLibInfo nativeLibInfo;