diff options
author | Sven Gothel <[email protected]> | 2015-01-30 21:30:51 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-01-30 21:30:51 +0100 |
commit | 9137288e44671262a9fc52e0a8ee7e409208e549 (patch) | |
tree | fabe58e89b56bb37ff34d00e4dd538a914b1f1ee /make/build-nativewindow.xml | |
parent | ffbd1f706ee68de0574c33601e393a5753bfabfb (diff) |
Bug 1124 - Refine AArch64 Linux in ant build recipe, add Android AArch64 build/install scripts
Diffstat (limited to 'make/build-nativewindow.xml')
-rw-r--r-- | make/build-nativewindow.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 76fc5a287..6a7ed8b95 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -344,6 +344,12 @@ <compilerarg value="/usr/include" /> </compiler> + <compiler id="compiler.cfg.linux.aarch64.nativewindow.x11" extends="compiler.cfg.linux.aarch64"> + <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> + <compilerarg value="-idirafter" /> + <compilerarg value="/usr/include" /> + </compiler> + <compiler id="compiler.cfg.solaris.nativewindow.x11" extends="compiler.cfg.solaris"> <compilerarg value="-I/usr/X11R6/include" /> </compiler> @@ -397,6 +403,12 @@ <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> </linker> + <linker id="linker.cfg.linux.aarch64.nativewindow.x11" extends="linker.cfg.linux.aarch64"> + <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> + <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> + <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> + </linker> + <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> <linkerarg value="-L/usr/sfw/lib"/> <syslibset libs="X11"/> @@ -485,6 +497,12 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" /> </target> + <target name="c.configure.linux.aarch64" if="isLinuxARM64"> + <echo message="Linux.aarch64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64.nativewindow.x11" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.aarch64.nativewindow.x11" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -527,7 +545,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> |