diff options
| author | Carsten Weisse <[email protected]> | 2006-10-25 21:04:38 +0000 |
|---|---|---|
| committer | Carsten Weisse <[email protected]> | 2006-10-25 21:04:38 +0000 |
| commit | acc601ab5dbc6f221801b73a188fac10d7fb09a6 (patch) | |
| tree | 1e24111d07a5c503c57852aa190ec267d62f7c4c | |
| parent | c7df913763ed5f585381f3c27fe9661d80f641f2 (diff) | |
joal via webstart from sun
* patch removed
* joal-native jar build removed
| -rw-r--r-- | build.xml | 48 |
1 files changed, 11 insertions, 37 deletions
@@ -22,7 +22,7 @@ <!-- different classpaths --> <path id="build.class.path"> <pathelement location="lib/jogl/jogl.jar"/> - <pathelement location="lib/joal/linux/joal.jar"/> + <pathelement location="lib/joal/joal.jar"/> <pathelement location="lib/lwjgl/lwjgl.jar"/> <pathelement location="lib/lwjgl/lwjgl_util.jar"/> </path> @@ -71,6 +71,9 @@ <fileset dir="lib/jogl"> <include name="*.jar"/> </fileset> + <fileset dir="lib/joal"> + <include name="*.jar"/> + </fileset> <fileset dir="lib/lwjgl"> <include name="*.jar"/> </fileset> @@ -151,7 +154,8 @@ defaultpackage="" overloadaggressively="off" printmapping="jake2.map"> <injar name="jake2.jar"/> <libraryjar name="lib/jogl/jogl.jar"/> - <libraryjar name="lib/joal/linux/joal.jar"/> + <libraryjar name="lib/joal/joal.jar"/> + <libraryjar name="lib/joal/gluegen-rt.jar"/> <libraryjar name="${classes}"/> <keep access="public" name="jake2.Jake2"> <method name="main(java.lang.String[])"/> @@ -194,7 +198,6 @@ </tarfileset> <tarfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> - <include name="patch/**"/> <include name="resources/**"/> <include name="lib/**"/> <include name="build.xml"/> @@ -210,7 +213,6 @@ <zip destfile="jake2src-${version}.zip"> <zipfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> - <include name="patch/**"/> <include name="resources/**"/> <include name="scripts/*.*"/> <include name="lib/**"/> @@ -237,38 +239,22 @@ </target> <!-- webstart --> - <target name="webstart" depends="dist,patch"> + <target name="webstart" depends="dist"> <mkdir dir="webstart/lib"/> <copy todir="webstart/lib"> <fileset dir="${dist}/lib"> <include name="**/*.jar"/> <exclude name="jogl.jar"/> - </fileset> - <fileset dir="."> - <include name="patch.jar"/> + <exclude name="joal.jar"/> + <exclude name="gluegen-rt.jar"/> </fileset> </copy> - <jar destfile="webstart/lib/linux/joal-native.jar" basedir="${dist}/lib/linux"> - <include name="libjoal.so"/> - </jar> + <mkdir dir="webstart/lib/linux"/> <jar destfile="webstart/lib/linux/lwjgl-native.jar" basedir="${dist}/lib/linux/lwjgl"> <include name="*.so"/> </jar> - <jar destfile="webstart/lib/linux/openal.jar" basedir="${dist}/lib/linux"> - <include name="libopenal.so"/> - </jar> - <jar destfile="webstart/lib/osx/joal-native.jar" basedir="${dist}/lib/osx"> - <include name="libjoal.jnilib"/> - </jar> - <jar destfile="webstart/lib/osx/lwjgl-native.jar" basedir="${dist}/lib/osx"> - <include name="liblwjgl.jnilib"/> - <include name="openal.dylib"/> - </jar> - <jar destfile="webstart/lib/windows/joal-native.jar" basedir="${dist}/lib/windows"> - <include name="joal.dll"/> - <include name="OpenAL32.dll"/> - </jar> + <mkdir dir="webstart/lib/windows"/> <jar destfile="webstart/lib/windows/lwjgl-native.jar" basedir="${dist}/lib/windows"> <include name="lwjgl.dll"/> <include name="lwjglaudio.dll"/> @@ -298,16 +284,4 @@ </fileset> </delete> </target> - - <!-- patch --> - <target name="patch"> - <javac destdir="${build}" optimize="on" debug="off" source="1.4"> - <src path="${patch}"/> - <include name="**"/> - <classpath refid="build.class.path"/> - </javac> - <jar destfile="patch.jar" basedir="${build}"> - <include name="net/**"/> - </jar> - </target> </project>
\ No newline at end of file |