[lwjgl] 03/05: unapply allarchs.diff
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Oct 27 01:23:27 GMT 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository lwjgl.
commit fbe5b7ce1ba60601396b5f006a9abd21b613ff09
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Oct 27 00:28:34 2014 +0000
unapply allarchs.diff
---
platform_build/linux_ant/build.xml | 36 ++----------------------------------
1 file changed, 2 insertions(+), 34 deletions(-)
diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml
index 74545f9..0058f05 100644
--- a/platform_build/linux_ant/build.xml
+++ b/platform_build/linux_ant/build.xml
@@ -6,14 +6,12 @@
<property name="libname64" value="liblwjgl64.so"/>
<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
- <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" />
<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
<target name="clean">
<delete>
<fileset dir="x32"/>
<fileset dir="x64"/>
- <fileset dir="deb"/>
<fileset dir="." includes="*.o"/>
<fileset dir="." includes="*.so"/>
</delete>
@@ -43,7 +41,6 @@
<property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
<property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
- <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
<condition property="build.32bit.only">
<not>
@@ -62,11 +59,8 @@
</and>
</condition>
- <condition property="build.debian">
- <os name="Linux" />
- </condition>
-
- <antcall target="compiledeb" />
+ <antcall target="compile32"/>
+ <antcall target="compile64"/>
</target>
<target name="compile32" unless="build.64bit.only">
@@ -120,30 +114,4 @@
<fileset file="${libname64}"/>
</apply>
</target>
-
- <target name="compiledeb">
- <mkdir dir="deb"/>
- <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags32} ${cflags_pthread}"/>
- <arg value="-I${java.home}/include"/>
- <arg value="-I${java.home}/include/linux"/>
- <arg value="-I${java.home}/../include"/>
- <arg value="-I${java.home}/../include/linux"/>
- <arg value="-I${java.home}/../include/solaris"/>
- <arg value="-I${native}/common"/>
- <arg value="-I${native}/linux"/>
- <mapper type="glob" from="*.c" to="*.o"/>
- <fileset dir="${native}/linux" includes="*.c"/>
- <fileset dir="${native}/generated" includes="*.c"/>
- <fileset dir="${native}/common" includes="*.c"/>
- </apply>
- <apply dir="." parallel="true" executable="gcc" failonerror="true">
- <srcfile/>
- <arg line="${linker_flagsdeb}"/>
- <fileset dir="deb" includes="*.o"/>
- </apply>
- <apply dir="." parallel="true" executable="strip" failonerror="true">
- <fileset file="${libname32}"/>
- </apply>
- </target>
</project>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lwjgl.git
More information about the pkg-java-commits
mailing list