diff options
author | Kenneth Russel <[email protected]> | 2006-04-19 00:32:41 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2006-04-19 00:32:41 +0000 |
commit | 9a6581592f8c876c4db957e9327dd128b823f17d (patch) | |
tree | f8672736adf5d69d689904f08acc69c98b819a71 | |
parent | d8ac37f6b2e5ece3cb6516799c4596689f33af4b (diff) |
Updated JOGLAppletLauncher with new native library names. Made pack200
application in build.xml verbose.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@726 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r-- | make/build.xml | 2 | ||||
-rwxr-xr-x | src/classes/com/sun/opengl/util/JOGLAppletLauncher.java | 12 |
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; |