Merged with current JOGL trunk (tag JOGL_1_1_PRE_B10)

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@245 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 60 insertions, 3 deletions

diff --git a/make/build.xml b/make/build.xml
index 19e192018..7ce104390 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -198,8 +198,10 @@
         <property name="java.includes.dir.linux" value="${java.includes.dir}/linux" />
         <property name="java.includes.dir.solaris" value="${java.includes.dir}/solaris" />
         <property name="java.includes.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" />
+        <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" />
         <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
         <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
+        <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
 	<condition property="cpu" value="sparc">
             <os name="SunOS" arch="sparc" />
         </condition>
@@ -303,7 +305,6 @@
         <property name="javadoc.dev.packagenames.platform" value="${javadoc.dev.packagenames.x11}" />
     </target>
 
-    
     <target name="declare.linux" depends="declare.x11">
         <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
         <property name="java.lib.dir.platform"                value="${java.lib.dir.linux}" />       
@@ -312,7 +313,22 @@
         <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
     </target>
     
+    <target name="declare.linux.amd64" depends="declare.x11">
+        <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
+        <property name="java.lib.dir.platform"                value="${java.lib.dir.linux.amd64}" />       
+
+        <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" /> 
+        <property name="linker.cfg.id"                        value="linker.cfg.linux.amd64" /> 
+    </target>
     
+    <target name="declare.freebsd" depends="declare.x11">
+        <property name="java.includes.dir.platform"           value="${java.includes.dir.freebsd}" />
+        <property name="java.lib.dir.platform"                value="${java.lib.dir.linux}" />
+
+        <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
+        <property name="linker.cfg.id"                        value="linker.cfg.linux" />
+    </target>
+
     <target name="declare.solaris" depends="declare.x11">
         <property name="java.includes.dir.platform"           value="${java.includes.dir.solaris}" />
         <property name="java.lib.dir.platform"                value="${java.lib.dir.solaris}" />
@@ -653,6 +669,10 @@
       <!-- compiler configuration -->
       <compiler id="compiler.cfg.linux" name="gcc" />
 
+      <compiler id="compiler.cfg.linux.amd64" name="gcc">
+        <compilerarg value="-fPIC"/>
+      </compiler>
+
       <compiler id="compiler.cfg.solaris" name="suncc">
       </compiler>
 
@@ -699,6 +719,10 @@
         </defineset>
       </compiler>
 
+      <compiler id="compiler.cfg.freebsd" name="gcc">
+        <includepath path="/usr/X11R6/include" />
+      </compiler>
+
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux" name="gcc">
@@ -706,6 +730,11 @@
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
+      <linker id="linker.cfg.linux.amd64" name="gcc">
+        <syslibset dir="/usr/X11R6/lib64" libs="GL, GLU, X11"/>
+        <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
+      </linker>
+
       <linker id="linker.cfg.solaris" name="suncc">
         <syslibset libs="GL, GLU, X11"/>
       </linker>
@@ -845,12 +874,18 @@
     <target name="c.compile.jogl.linux" depends="declare.linux, c.build.jogl, c.build.cg" >
     </target>
     
+    <target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
+    </target>
+    
     <target name="c.compile.jogl.solaris" depends="declare.solaris, c.build.jogl">
     </target>
     
     <target name="c.compile.jogl.macosx" depends="declare.macosx, c.build.jogl, c.build.cg">
     </target>
     
+    <target name="c.compile.jogl.freebsd" depends="declare.freebsd, c.build.jogl, c.build.cg" >
+    </target>
+
     <!-- ================================================================== -->
     <!--
        - Build the jogl.jar file.
@@ -1001,7 +1036,7 @@
     <target name="all">
         <fail>
         
-Use a platform specific target:  linux, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
+Use a platform specific target:  linux, linux.amd64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
         </fail>
     </target>      
 
@@ -1050,7 +1085,18 @@ Use a platform specific target:  linux, macosx, solaris, win32.vc6, win32.vc7, w
     </target>
 
     <!--
-       - Solaris (assuming Solaris CC)
+       - Linux on AMD64 (assuming GCC)
+      -->
+    <target name="linux.amd64" depends="setup.java.home.dir.nonmacosx, declare.linux.amd64">
+        <!-- Generate, compile, and build the jar for the Java sources. -->
+        <antcall target="jar" inheritRefs="true" />
+
+        <!-- Compile the native C sources and build the jogl lib. -->
+        <antcall target="c.compile.jogl.linux.amd64" />
+    </target>
+
+    <!--
+        - Solaris (assuming Solaris CC)
       -->
     <target name="solaris" depends="setup.java.home.dir, declare.solaris">
         <!-- Generate, compile, and build the jar for the Java sources. -->
@@ -1070,4 +1116,15 @@ Use a platform specific target:  linux, macosx, solaris, win32.vc6, win32.vc7, w
         <!-- Compile the native C sources and build the jogl lib. -->
         <antcall target="c.compile.jogl.macosx" />
     </target>
+
+    <!--
+       - FreeBSD (assuming GCC)
+      -->
+    <target name="freebsd" depends="declare.freebsd">
+        <!-- Generate, compile, and build the jar for the Java sources. -->
+        <antcall target="jar" inheritRefs="true" />
+
+        <!-- Compile the native C sources and build the jogl lib. -->
+        <antcall target="c.compile.jogl.freebsd" />
+    </target>
 </project>