diff options
| author | Michael Bien <[email protected]> | 2010-07-18 02:36:25 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-07-18 02:36:25 +0200 |
| commit | 6c14437ff4ffdefbce3d61aacc3d1389fec47a69 (patch) | |
| tree | 32e6b586cb6fdebc058432a0e45dddb3cdccd17c /make/build-nativewindow.xml | |
| parent | 5be946fac88210f60dd2e2c212d39b62e6c2e0b4 (diff) | |
| parent | ceec1ed6f1d6ebe904326a7517259d920098d9a0 (diff) | |
Merge branch 'freebsd-fixes' of http://github.com/rothwell/jogl
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 861dc00c5..f7708d4f4 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -352,14 +352,23 @@ <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/X11R6/include" /> + <includepath path="/usr/local/include" /> </compiler> <!-- linker configuration --> - + + <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd"> + <syslibset dir="/usr/local/lib" libs="X11"/> + <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> + </linker> + + <linker id="linker.cfg.freebsd.amd64.nativewindow.x11" extends="linker.cfg.freebsd.amd64"> + <syslibset dir="/usr/local/lib" libs="X11" /> + <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> + </linker> + <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux"> <syslibset libs="X11"/> <syslibset libs="Xxf86vm" /> @@ -464,11 +473,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" /> + <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> + <echo message="FreeBSD.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> - <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> + <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.nativewindow" /> + <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" /> |