Package list lwjgl / 22a1c85
Refresh allarchs.patch. Markus Koschany 5 years ago
2 changed file(s) with 79 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
0 From: Markus Koschany <apo@debian.org>
1 Date: Sat, 9 Apr 2016 19:07:56 +0200
2 Subject: allarchs
3
4 ---
5 platform_build/linux_ant/build.xml | 34 ++++++++++++++++++++++++++++++++--
6 1 file changed, 32 insertions(+), 2 deletions(-)
7
8 diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml
9 index e5ce8d1..db62711 100644
10 --- a/platform_build/linux_ant/build.xml
11 +++ b/platform_build/linux_ant/build.xml
12 @@ -6,12 +6,14 @@
13 <property name="libname64" value="liblwjgl64.so"/>
14 <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/i386 -ljawt" />
15 <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" />
16 + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" />
17 <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
18
19 <target name="clean">
20 <delete>
21 <fileset dir="x32"/>
22 <fileset dir="x64"/>
23 + <fileset dir="deb"/>
24 <fileset dir="." includes="*.o"/>
25 <fileset dir="." includes="*.so"/>
26 </delete>
27 @@ -38,6 +40,7 @@
28
29 <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32}"/>
30 <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64}"/>
31 + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
32
33 <condition property="build.32bit.only">
34 <not>
35 @@ -56,8 +59,10 @@
36 </and>
37 </condition>
38
39 - <antcall target="compile32"/>
40 - <antcall target="compile64"/>
41 + <condition property="build.debian"><condition property="build.debian">
42 + <os name="Linux" />
43 + </condition>
44 + <antcall target="compiledeb" />
45 </target>
46
47 <target name="compile32" unless="build.64bit.only">
48 @@ -123,4 +128,29 @@
49 <fileset file="${libname64}"/>
50 </apply>
51 </target>
52 +<target name="compiledeb">
53 + <mkdir dir="deb"/>
54 + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
55 + <arg line="${cflags32} ${cflags_pthread} ${cflags_ppc64le}"/>
56 + <arg value="-I${java.home}/include"/>
57 + <arg value="-I${java.home}/include/linux"/>
58 + <arg value="-I${java.home}/../include"/>
59 + <arg value="-I${java.home}/../include/linux"/>
60 + <arg value="-I${java.home}/../include/solaris"/>
61 + <arg value="-I${native}/common"/>
62 + <arg value="-I${native}/linux"/>
63 + <mapper type="glob" from="*.c" to="*.o"/>
64 + <fileset dir="${native}/linux" includes="*.c"/>
65 + <fileset dir="${native}/generated" includes="*.c"/>
66 + <fileset dir="${native}/common" includes="*.c"/>
67 + </apply>
68 + <apply dir="." parallel="true" executable="gcc" failonerror="true">
69 + <srcfile/>
70 + <arg line="${linker_flagsdeb}"/>
71 + <fileset dir="deb" includes="*.o"/>
72 + </apply>
73 + <apply dir="." parallel="true" executable="strip" failonerror="true">
74 + <fileset file="${libname32}"/>
75 + </apply>
76 + </target>
77 </project>
00 javadoc.patch
11 nomacosx.patch
2 allarchs.patch