diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index da32f1809..8428dd88d 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -333,12 +333,19 @@ <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> <!-- compiler configuration --> + <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these --> <compiler id="compiler.cfg.freebsd.nativewindow" extends="compiler.cfg.freebsd"> <!-- Need to force X11R6 headers on to include path after stub_includes --> <includepath path="/usr/local/include" /> </compiler> + <compiler id="compiler.cfg.linux.armv7.nativewindow.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.nativewindow.x11" extends="linker.cfg.freebsd"> @@ -359,12 +366,24 @@ <syslibset libs="Xinerama"/> </linker> + <linker id="linker.cfg.linux.x86.nativewindow.x11" extends="linker.cfg.linux.x86"> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> + <syslibset libs="Xinerama"/> + </linker> + <linker id="linker.cfg.linux.amd64.nativewindow.x11" extends="linker.cfg.linux.amd64"> <syslibset libs="X11"/> <syslibset libs="Xxf86vm" /> <syslibset libs="Xinerama"/> </linker> + <linker id="linker.cfg.linux.armv7.nativewindow.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="Xxf86vm" /> + <syslibset dir="${gluegen.root}/make/lib/arm-linux-gnueabi/ubuntu-11.04/lib" libs="Xinerama"/> + </linker> + <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> <syslibset libs="X11"/> </linker> @@ -422,8 +441,8 @@ <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.oswin" value="linker.cfg.linux.nativewindow.x11" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.x86" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.x86.nativewindow.x11" /> </target> <target name="c.configure.linux.amd64" if="isLinuxAMD64"> @@ -432,13 +451,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" /> </target> + <target name="c.configure.linux.armv7" if="isLinuxARMv7"> + <echo message="Linux.armv7" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7.nativewindow.x11" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv7.nativewindow.x11" /> + </target> + <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.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.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> |