diff options
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index 178824f01..5c12965d6 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -219,6 +219,12 @@ <includepath path="/usr/local/include" /> </compiler> + <compiler id="compiler.cfg.linux.armv7.newt.x11" extends="compiler.cfg.linux.armv7"> + <!-- 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"> @@ -244,12 +250,24 @@ <syslibset libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86"> + <syslibset libs="X11"/> + <syslibset libs="Xrandr"/> + <syslibset libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64"> <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xxf86vm" /> </linker> + <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="X11"/> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xrandr"/> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> </linker> @@ -309,10 +327,10 @@ <target name="c.configure.linux.x86" if="isLinuxX86"> <echo message="Linux.x86" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux" /> - <property name="linker.cfg.id.core" value="linker.cfg.linux" /> - <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" - else="linker.cfg.linux"> + <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" /> + <property name="linker.cfg.id.core" value="linker.cfg.linux.x86" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.x86.newt.x11" + else="linker.cfg.linux.x86"> <isset property="isX11" /> </condition> <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> @@ -329,6 +347,17 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> + <target name="c.configure.linux.armv7" if="isLinuxARMv7"> + <echo message="Linux.armv7" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.newt.x11" /> + <property name="linker.cfg.id.core" value="linker.cfg.linux.armv7" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.newt.x11" + else="linker.cfg.linux.armv7"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -336,7 +365,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.ia64,c.configure.x11" if="isLinux"/> + <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> |