From 380578db0532e29bd66ce2d301f5309eb0e25f9d Mon Sep 17 00:00:00 2001
From: Mark Rothwell <rothwell@coreland.ath.cx>
Date: Sat, 26 Jun 2010 05:29:23 +0000
Subject: Split and use new linker definitions for FreeBSD

---
 make/build-jogl.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 74b9da089..a6758f042 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1110,6 +1110,16 @@
 
       <!-- linker configuration -->
  
+      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
+        <syslibset libs="X11"/>
+        <syslibset libs="Xxf86vm" />
+      </linker>
+
+      <linker id="linker.cfg.freebsd.amd64.jogl.x11" extends="linker.cfg.freebsd.amd64">
+        <syslibset libs="X11"/>
+        <syslibset libs="Xxf86vm" />
+      </linker>
+
       <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
         <syslibset libs="X11"/>
         <syslibset libs="Xxf86vm" />
@@ -1226,12 +1236,20 @@
       <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.amd64.jogl.x11" />
     </target>
    
-    <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
+    <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
       <echo message="FreeBSD" />
       <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
-      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
     </target>
 
+    <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
+      <echo message="FreeBSD" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.amd64.jogl.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" />
       <property name="compiler.cfg.id"                     value="compiler.cfg.hpux" />
-- 
cgit v1.2.3