Fabio Erculiani
110 lines
6.2 KiB
Diff
110 lines
6.2 KiB
Diff
diff -Nur lwjgl/build.xml lwjgl-new/build.xml
|
|
--- lwjgl/build.xml 2006-08-10 08:45:10.000000000 +0000
|
|
+++ lwjgl-new/build.xml 2006-09-10 23:39:36.000000000 +0000
|
|
@@ -359,7 +359,7 @@
|
|
<condition property="native_path" value="libs/macosx">
|
|
<os name="Mac OS X" />
|
|
</condition>
|
|
- <java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
|
|
+ <java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar:${lwjgl.lib}/jutils.jar" fork="true">
|
|
<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
|
|
<jvmarg value="-Djava.library.path=${native_path}"/>
|
|
</java>
|
|
@@ -417,11 +417,13 @@
|
|
<copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/>
|
|
<copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/>
|
|
<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
|
|
+ <copy file="${lwjgl.lib}/jutils.jar" todir="applet"/>
|
|
<zip destfile="applet/res.jar">
|
|
<zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
|
|
</zip>
|
|
<signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="applet/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
+ <signjar jar="applet/jutils.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="applet/lwjgl_util_applet.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="applet/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
@@ -433,6 +435,7 @@
|
|
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
|
|
</delete>
|
|
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
|
|
+ <copy file="${lwjgl.lib}/jutils.jar" todir="lwjgl.temp/jar"/>
|
|
<copy todir="${lwjgl.temp}/native/win32">
|
|
<fileset dir="${lwjgl.lib}/win32">
|
|
<patternset refid="lwjgl-win32.fileset" />
|
|
@@ -474,7 +477,7 @@
|
|
|
|
<!-- Compiles the Java source code -->
|
|
<target name="compile" description="Compiles the java source code" depends="-initialize">
|
|
- <javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core">
|
|
+ <javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/jutils.jar" taskname="core">
|
|
<src path="${lwjgl.src}/java/"/>
|
|
<src path="${lwjgl.src}/generated/"/>
|
|
<include name="org/lwjgl/*.java"/>
|
|
@@ -573,7 +576,7 @@
|
|
</javac>
|
|
</target>
|
|
|
|
- <target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
|
|
+ <target name="generate-all" depends="-initialize, generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
|
|
|
|
<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
|
|
<!-- Generate OpenAL -->
|
|
@@ -777,6 +780,7 @@
|
|
<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
+ <signjar jar="${lwjgl.temp}/jnlp/jutils.jar}" alisa="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
|
|
</target>
|
|
|
|
<!-- -->
|
|
diff -Nur lwjgl/platform_build/linux_ant/build.xml lwjgl-new/platform_build/linux_ant/build.xml
|
|
--- lwjgl/platform_build/linux_ant/build.xml 2006-07-11 21:46:44.000000000 +0000
|
|
+++ lwjgl-new/platform_build/linux_ant/build.xml 2006-09-11 00:57:27.000000000 +0000
|
|
@@ -4,8 +4,8 @@
|
|
<property name="native" location="../../src/native"/>
|
|
<property name="libname32" value="liblwjgl.so"/>
|
|
<property name="libname64" value="liblwjgl64.so"/>
|
|
- <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
|
|
- <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/lib/amd64 -ljawt -lXxf86vm -lXcursor -lXrender -lXrandr -lXfixes"/>
|
|
+ <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
|
|
+ <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/jre/lib/amd64 -ljawt -lXxf86vm -lXcursor -lXrender -lXrandr -lXfixes"/>
|
|
<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
|
|
|
|
<target name="clean">
|
|
@@ -17,7 +17,7 @@
|
|
|
|
<target name="compile">
|
|
<exec executable="uname" outputproperty="hwplatform">
|
|
- <arg value="-i"/>
|
|
+ <arg value="-m"/>
|
|
</exec>
|
|
<condition property="libs" value="${libs64}" else="${libs32}">
|
|
<equals arg1="${hwplatform}" arg2="x86_64"/>
|
|
@@ -26,6 +26,9 @@
|
|
<equals arg1="${hwplatform}" arg2="x86_64"/>
|
|
</condition>
|
|
<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
|
|
+ <echo message="${java.home}"/>
|
|
+ <echo message="${native}"/>
|
|
+ <echo message="${cflags}"/>
|
|
<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
|
|
<arg line="${cflags}"/>
|
|
<arg value="-I${java.home}/include"/>
|
|
@@ -37,14 +40,12 @@
|
|
<fileset dir="${native}/generated" includes="*.c"/>
|
|
<fileset dir="${native}/common" includes="*.c"/>
|
|
</apply>
|
|
+ <echo message="${linker_flags}"/>
|
|
<apply dir="." parallel="true" executable="cc" failonerror="true">
|
|
<srcfile/>
|
|
<arg line="${linker_flags}"/>
|
|
<fileset dir="." includes="*.o"/>
|
|
</apply>
|
|
- <apply dir="." parallel="true" executable="strip" failonerror="true">
|
|
- <fileset file="${libname}"/>
|
|
- </apply>
|
|
</target>
|
|
</project>
|
|
|