Drop allarchs.patch
Markus Koschany
8 years ago
| 0 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> | |
| 1 | Description: support for building on all architectures | |
| 2 | ||
| 3 | --- a/platform_build/linux_ant/build.xml | |
| 4 | +++ b/platform_build/linux_ant/build.xml | |
| 5 | @@ -6,12 +6,14 @@ | |
| 6 | <property name="libname64" value="liblwjgl64.so"/> | |
| 7 | <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> | |
| 8 | <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" /> | |
| 9 | + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" /> | |
| 10 | <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> | |
| 11 | ||
| 12 | <target name="clean"> | |
| 13 | <delete> | |
| 14 | <fileset dir="x32"/> | |
| 15 | <fileset dir="x64"/> | |
| 16 | + <fileset dir="deb"/> | |
| 17 | <fileset dir="." includes="*.o"/> | |
| 18 | <fileset dir="." includes="*.so"/> | |
| 19 | </delete> | |
| 20 | @@ -41,6 +43,7 @@ | |
| 21 | ||
| 22 | <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> | |
| 23 | <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> | |
| 24 | + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> | |
| 25 | ||
| 26 | <condition property="build.32bit.only"> | |
| 27 | <not> | |
| 28 | @@ -59,8 +62,11 @@ | |
| 29 | </and> | |
| 30 | </condition> | |
| 31 | ||
| 32 | - <antcall target="compile32"/> | |
| 33 | - <antcall target="compile64"/> | |
| 34 | + <condition property="build.debian"> | |
| 35 | + <os name="Linux" /> | |
| 36 | + </condition> | |
| 37 | + | |
| 38 | + <antcall target="compiledeb" /> | |
| 39 | </target> | |
| 40 | ||
| 41 | <target name="compile32" unless="build.64bit.only"> | |
| 42 | @@ -114,4 +120,30 @@ | |
| 43 | <fileset file="${libname64}"/> | |
| 44 | </apply> | |
| 45 | </target> | |
| 46 | + | |
| 47 | + <target name="compiledeb"> | |
| 48 | + <mkdir dir="deb"/> | |
| 49 | + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> | |
| 50 | + <arg line="${cflags32} ${cflags_pthread}"/> | |
| 51 | + <arg value="-I${java.home}/include"/> | |
| 52 | + <arg value="-I${java.home}/include/linux"/> | |
| 53 | + <arg value="-I${java.home}/../include"/> | |
| 54 | + <arg value="-I${java.home}/../include/linux"/> | |
| 55 | + <arg value="-I${java.home}/../include/solaris"/> | |
| 56 | + <arg value="-I${native}/common"/> | |
| 57 | + <arg value="-I${native}/linux"/> | |
| 58 | + <mapper type="glob" from="*.c" to="*.o"/> | |
| 59 | + <fileset dir="${native}/linux" includes="*.c"/> | |
| 60 | + <fileset dir="${native}/generated" includes="*.c"/> | |
| 61 | + <fileset dir="${native}/common" includes="*.c"/> | |
| 62 | + </apply> | |
| 63 | + <apply dir="." parallel="true" executable="gcc" failonerror="true"> | |
| 64 | + <srcfile/> | |
| 65 | + <arg line="${linker_flagsdeb}"/> | |
| 66 | + <fileset dir="deb" includes="*.o"/> | |
| 67 | + </apply> | |
| 68 | + <apply dir="." parallel="true" executable="strip" failonerror="true"> | |
| 69 | + <fileset file="${libname32}"/> | |
| 70 | + </apply> | |
| 71 | + </target> | |
| 72 | </project> |