diff options
| author | Mark Rothwell <[email protected]> | 2010-06-26 05:30:42 +0000 |
|---|---|---|
| committer | Mark Rothwell <[email protected]> | 2010-06-26 05:30:42 +0000 |
| commit | 0a9b3dece8bd08829ebf758bc8cfb4e9006d89ec (patch) | |
| tree | 484e07d49b02936f099b181c49aa8ed71082bfe1 | |
| parent | 380578db0532e29bd66ce2d301f5309eb0e25f9d (diff) | |
Split and use new linker definitions for FreeBSD (nativewindow)
| -rw-r--r-- | make/build-nativewindow.xml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 861dc00c5..a35f993aa 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -359,7 +359,17 @@ </compiler> <!-- linker configuration --> - + + <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd"> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> + </linker> + + <linker id="linker.cfg.freebsd.amd64.nativewindow.x11" extends="linker.cfg.freebsd.amd64"> + <syslibset libs="X11"/> + <syslibset libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> <syslibset libs="X11"/> <syslibset libs="Xxf86vm" /> @@ -464,11 +474,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.nativewindow.x11" /> </target> - <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD"> - <echo message="FreeBSD" /> - <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> - <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> + <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> + <echo message="FreeBSD.x86" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.nativewindow.x11" /> </target> + + <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64"> + <echo message="FreeBSD.AMD64" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd.amd64" /> + <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> + </target> + + <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> <echo message="HP-UX" /> |