summaryrefslogtreecommitdiffstats
path: root/make/build-newt.xml
diff options
context:
space:
mode:
Diffstat (limited to 'make/build-newt.xml')
-rw-r--r--make/build-newt.xml27
1 files changed, 26 insertions, 1 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 4a5997b02..cf8330eb1 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -271,6 +271,12 @@
<compilerarg value="/usr/include" />
</compiler>
+ <compiler id="compiler.cfg.linux.aarch64.newt.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>
+
<!-- linker configuration -->
<linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
@@ -331,6 +337,12 @@
<syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
</linker>
+ <linker id="linker.cfg.linux.aarch64.newt.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="Xrandr" />
+ <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
+ </linker>
+
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
<syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
</linker>
@@ -431,6 +443,16 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
+ <target name="c.configure.linux.aarch64" if="isLinuxARM64">
+ <echo message="Linux.aarch64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64.newt.x11" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.aarch64.newt.x11"
+ else="linker.cfg.linux.aarch64">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
<target name="c.configure.linux.hppa" if="isLinuxHppa">
<echo message="Linux.hppa" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -497,7 +519,7 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
</target>
- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,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.linux.ia64,c.configure.x11" if="isLinux"/>
+ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,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.linux.ia64,c.configure.x11" if="isLinux"/>
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
@@ -868,6 +890,7 @@
linkoffline="${javadoc.link} 142-packages"
bottom="${javadoc.bottom}" >
<classpath refid="jogl_doc.classpath"/>
+ <arg value="${javadoc.xarg1}"/>
</javadoc>
</target>
@@ -884,6 +907,7 @@
linkoffline="${javadoc.link} 142-packages"
bottom="${javadoc.bottom}" >
<classpath refid="jogl_doc.classpath"/>
+ <arg value="${javadoc.xarg1}"/>
</javadoc>
</target>
@@ -900,6 +924,7 @@
linkoffline="${javadoc.link} 142-packages"
bottom="${javadoc.bottom}" >
<classpath refid="jogl_doc.classpath"/>
+ <arg value="${javadoc.xarg1}"/>
</javadoc>
</target>