diff options
| -rw-r--r-- | build.xml | 51 | ||||
| -rw-r--r-- | install.xml | 88 | ||||
| -rw-r--r-- | scripts/Jake2.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2.sh | 5 | ||||
| -rw-r--r-- | scripts/Jake2_dedicated.sh | 2 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.sh | 8 | ||||
| -rw-r--r-- | scripts/Jake2_mac.sh | 7 | ||||
| -rw-r--r-- | scripts/Jake2_mac_lwjgl.sh | 7 |
9 files changed, 11 insertions, 165 deletions
@@ -23,8 +23,6 @@ <pathelement location="lib/jogamp/gluegen-rt.jar"/> <pathelement location="lib/jogamp/jogl-all.jar"/> <pathelement location="lib/jogamp/joal.jar"/> - <pathelement location="lib/lwjgl/lwjgl.jar"/> - <pathelement location="lib/lwjgl/lwjgl_util.jar"/> <!-- pathelement location="${java.home}/lib/plugin.jar"/ --> </path> @@ -68,27 +66,11 @@ <!-- copy files --> <target name="copy"> - <copy todir="${dist}/lib"> - <fileset dir="lib/lwjgl"> + <copy todir="${dist}/lib/jogamp"> + <fileset dir="lib/jogamp"> <include name="*.jar"/> </fileset> </copy> - <copy todir="${dist}/lib/linux/lwjgl"> - <fileset dir="lib/lwjgl/linux"> - <include name="*"/> - </fileset> - </copy> - <copy todir="${dist}/lib/windows/lwjgl"> - <fileset dir="lib/lwjgl/windows"> - <include name="*"/> - </fileset> - </copy> - <copy todir="${dist}/lib/osx/lwjgl"> - <fileset dir="lib/lwjgl/osx"> - <include name="*"/> - </fileset> - </copy> - <copy todir="${dist}"> <fileset dir="scripts"> <include name="Jake2*"/> @@ -141,25 +123,12 @@ </proguard --> </target> - <target name="patch" depends="copy"> - <!-- performance patch for lwjgl --> - <javac destdir="${build}" optimize="off" debug="on" source="1.6"> - <src path="lib/lwjgl/patch"/> - <include name="org/lwjgl/**"/> - <classpath refid="build.class.path"/> - </javac> - <!-- update original lwjgl.jar --> - <jar destfile="${dist}/lib/lwjgl.jar" basedir="${build}" update="true"> - <include name="org/lwjgl/**"/> - </jar> - </target> - <!-- everything --> <target name="all" depends="installer,bindist,srcdist"> </target> <!-- dist --> - <target name="dist" depends="jar,copy,patch"> + <target name="dist" depends="jar,copy"> </target> <!-- binary distribution --> @@ -241,20 +210,6 @@ </fileset> </copy> - <mkdir dir="webstart/lib/linux"/> - <jar destfile="webstart/lib/linux/lwjgl-native.jar" basedir="${dist}/lib/linux/lwjgl"> - <include name="*.so"/> - </jar> - <mkdir dir="webstart/lib/osx"/> - <jar destfile="webstart/lib/osx/lwjgl-native.jar" basedir="${dist}/lib/osx/lwjgl"> - <include name="liblwjgl.jnilib"/> - <include name="openal.dylib"/> - </jar> - <mkdir dir="webstart/lib/windows"/> - <jar destfile="webstart/lib/windows/lwjgl-native.jar" basedir="${dist}/lib/windows/lwjgl"> - <include name="lwjgl.dll"/> - <include name="OpenAL32.dll"/> - </jar> <signjar keystore="${user.home}/bytonic" alias="bytonic" storepass="${bytonic.pass}"> <fileset dir="webstart/lib"> <include name="**/*.jar"/> diff --git a/install.xml b/install.xml index 871b787..7955998 100644 --- a/install.xml +++ b/install.xml @@ -44,7 +44,6 @@ <include name="*"/> <include name="lib/jake2.jar"/> <exclude name="*.sh"/> - <exclude name="*lwjgl.bat"/> </fileset> </pack> <pack name="Jake2" required="yes"> @@ -54,8 +53,6 @@ <include name="*"/> <include name="lib/jake2.jar"/> <exclude name="*.bat"/> - <exclude name="*mac.sh"/> - <exclude name="*lwjgl.sh"/> </fileset> <executable targetfile="$INSTALL_PATH/Jake2.sh"/> </pack> @@ -72,91 +69,12 @@ <executable targetfile="$INSTALL_PATH/Jake2_mac.sh"/> </pack> - <pack name="jogl OpenGL library" required="yes"> + <pack name="jogamp library" required="yes"> <description>default OpenGL library</description> - <os family="windows"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="windows/jogl*"/> - <include name="jogl.jar"/> + <fileset dir="lib/jogamp" targetdir="$INSTALL_PATH/lib/jogamp"> + <include name="*jar"/> </fileset> </pack> - <pack name="jogl OpenGL library" required="yes"> - <description>default OpenGL library</description> - <os name="Linux"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="linux/*jogl*"/> - <include name="jogl.jar"/> - </fileset> - </pack> - <pack name="jogl OpenGL library" required="yes"> - <description>default OpenGL library</description> - <os name="Mac OS X"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="osx/*jogl*"/> - <include name="jogl.jar"/> - </fileset> - </pack> - - <pack name="joal sound library" required="no"> - <description>default sound library</description> - <os family="windows"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="windows/joal*"/> - <include name="windows/OpenAL*"/> - </fileset> - </pack> - <pack name="joal sound library" required="no"> - <description>default sound library</description> - <os name="Linux"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="linux/*joal*"/> - <include name="linux/*openal*"/> - </fileset> - </pack> - <pack name="joal sound library" required="no"> - <description>default sound library</description> - <os name="Mac OS X"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="osx/*joal*"/> - <include name="osx/*openal*"/> - </fileset> - </pack> - - <pack name="lwjgl library" required="no"> - <description>alternative OpenGL and sound driver</description> - <os family="windows"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="windows/lwjgl*"/> - <include name="lwjgl*.jar"/> - </fileset> - <fileset dir="." targetdir="$INSTALL_PATH"> - <include name="*lwjgl.bat"/> - </fileset> - </pack> - <pack name="lwjgl library" required="no"> - <description>alternative OpenGL and sound driver</description> - <os name="Linux"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="linux/lwjgl/*"/> - <include name="lwjgl*.jar"/> - </fileset> - <fileset dir="." targetdir="$INSTALL_PATH"> - <include name="Jake2_lwjgl.sh"/> - </fileset> - <executable targetfile="$INSTALL_PATH/Jake2_lwjgl.sh"/> - </pack> - <pack name="lwjgl library" required="no"> - <description>alternative OpenGL and sound driver</description> - <os name="Mac OS X"/> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <include name="osx/lwjgl/*"/> - <include name="lwjgl*.jar"/> - </fileset> - <fileset dir="." targetdir="$INSTALL_PATH"> - <include name="Jake2_mac_lwjgl.sh"/> - </fileset> - <executable targetfile="$INSTALL_PATH/Jake2_mac_lwjgl.sh"/> - </pack> </packs> <!-- native type="izpack" name="ShellLink.dll"/ --> diff --git a/scripts/Jake2.bat b/scripts/Jake2.bat index bc8da76..96074bd 100644 --- a/scripts/Jake2.bat +++ b/scripts/Jake2.bat @@ -1,4 +1,4 @@ @echo off SET PATH=lib\windows;%PATH% -SET CP=lib/jake2.jar;lib/jogl.jar;lib/joal.jar;lib/gluegen-rt.jar -start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2
\ No newline at end of file +SET CP=lib/jogamp/gluegen-rt.jar;lib/jogamp/joal.jar;lib/jogamp/jogl-all.jar;lib/jake2.jar +start javaw -Dsun.java2d.noddraw=true -cp %CP% jake2.Jake2 diff --git a/scripts/Jake2.sh b/scripts/Jake2.sh index 29a00ce..50aa11b 100644 --- a/scripts/Jake2.sh +++ b/scripts/Jake2.sh @@ -2,7 +2,6 @@ cd `dirname $0` -export LD_LIBRARY_PATH=lib/linux -CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar +CP=lib/jogamp/gluegen-rt.jar:lib/jogamp/joal.jar:lib/jogamp/jogl-all.jar:lib/jake2.jar -exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 +exec java -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_dedicated.sh b/scripts/Jake2_dedicated.sh index 8f9484e..0f210ed 100644 --- a/scripts/Jake2_dedicated.sh +++ b/scripts/Jake2_dedicated.sh @@ -2,6 +2,6 @@ cd `dirname $0`/.. -CP=dist/lib/jake2.jar +CP=lib/jake2.jar exec java -Xmx64M -cp $CP $D_ARGS jake2.Jake2 +set dedicated 1 +set timeout 12000 $* diff --git a/scripts/Jake2_lwjgl.bat b/scripts/Jake2_lwjgl.bat deleted file mode 100644 index 950bcab..0000000 --- a/scripts/Jake2_lwjgl.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -SET PATH=lib\windows;%PATH% -SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar -start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows/lwjgl -cp %CP% jake2.Jake2
\ No newline at end of file diff --git a/scripts/Jake2_lwjgl.sh b/scripts/Jake2_lwjgl.sh deleted file mode 100644 index 6dfcdf5..0000000 --- a/scripts/Jake2_lwjgl.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -export LD_LIBRARY_PATH=lib/linux/lwjgl -CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar - -exec java -Xmx100M -Djava.library.path=lib/linux/lwjgl -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac.sh b/scripts/Jake2_mac.sh deleted file mode 100644 index f09dd52..0000000 --- a/scripts/Jake2_mac.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export LD_LIBRARY_PATH=lib/osx -export DYLD_LIBRARY_PATH=lib/osx -CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar - -exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac_lwjgl.sh b/scripts/Jake2_mac_lwjgl.sh deleted file mode 100644 index 8408e8f..0000000 --- a/scripts/Jake2_mac_lwjgl.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export LD_LIBRARY_PATH=lib/osx/lwjgl -export DYLD_LIBRARY_PATH=lib/osx/lwjgl -CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar - -exec java -Xmx100M -Djava.library.path=lib/osx/lwjgl -cp $CP jake2.Jake2 |