From 349de70bd5981a18af10d4a23d24265e65512b07 Mon Sep 17 00:00:00 2001
From: gfxadmin <gfxadmin@domain.net>
Date: Tue, 25 Apr 2006 01:22:05 +0000
Subject: Issue number: Obtained from: Submitted by:  Travis Reviewed by:

Add 64 bit Sparcv9 Solaris build.  A concomitant change will be putback
into the gluegen tree shortly for properly detecting this case.

The way that gluegen checks 32 or 64 bit-ness is which java binary is in
your path, 32 bit sparc java or 64 bit sparcv9 java.

In order to build the jogl 64 bit target, you need to have installed the
64 bit OpenGL sparcv9 libraries.

This builds the JOGL binaries in the same place as the 32 bit JOGL .so
library builds binaries, so you can build one or the other with a given
source tree but not both.

The jogl.jar generated by either the 32 or 64 bit target it identical,
however.

I have not added the 64 bit target to the dist build, that is coming soon.
As well, it will be added to the nightly builds soon along with Linux AMD64
and Solaris AMD64.


 Modified Files:
 	make/build.xml
 ----------------------------------------------------------------------


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@736 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 make/build.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index b324ffa1d..d7f9c7758 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -218,6 +218,9 @@
 	<condition property="cpu" value="sparc">
             <os name="SunOS" arch="sparc" />
         </condition>
+	<condition property="cpu" value="sparcv9">
+            <os name="SunOS" arch="sparcv9" />
+        </condition>
 	<condition property="cpu" value="i386">
             <os name="SunOS" arch="x86" />
         </condition>
@@ -385,7 +388,20 @@
       <property name="linker.cfg.id.core"                   value="linker.cfg.solaris" /> 
       <property name="linker.cfg.id.drihack"                value="linker.cfg.solaris.drihack" /> 
     </target>
-    
+  
+ 
+    <target name="declare.solarisSparcv9" depends="declare.x11" if="isSolarisSparcv9">
+      <echo message="SolarisSparcv9" />
+      <property name="java.includes.dir.platform"           value="${java.includes.dir.solaris}" />
+      <property name="java.lib.dir.platform"                value="${java.lib.dir.solaris}" />
+
+      <property name="compiler.cfg.id"                      value="compiler.cfg.solarisSparcv9" /> 
+      <property name="linker.cfg.id.core"                   value="linker.cfg.solarisSparcv9" /> 
+      <property name="linker.cfg.id.drihack"                value="linker.cfg.solarisSparcv9.drihack" /> 
+    </target>
+   
+
+ 
     <target name="declare.macosx" if="isOSX">
       <echo message="MacOSX" />
       <!-- Set platform configuration files. -->
@@ -450,7 +466,7 @@
         <mkdir dir="${obj.cg}" />
     </target>
 
-    <target name="declare" depends="init,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux" />
+    <target name="declare" depends="init,declare.win32,declare.linux,declare.solaris,declare.solarisSparcv9,declare.macosx,declare.freebsd,declare.hpux" />
 
     <!-- ================================================================== -->
     <!-- GlueGen and BuildStaticGLInfo creation, task setup and Java file generation -->
@@ -675,6 +691,8 @@
         <javac srcdir="${src.generated.java}"
                destdir="${classes}"
                includes="javax/media/opengl/GL.java"
+               fork="yes"
+               memoryMaximumSize="128m"
                source="1.4" debug="true" debuglevel="source,lines">
         </javac>
     </target>
@@ -682,7 +700,10 @@
     <target name="java.compile.secondpass" depends="java.generate.composable.pipeline">
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
-               excludes="${java.excludes.platform},com/sun/opengl/impl/nurbs/**" source="${jogl.sourcelevel}" debug="true" debuglevel="source,lines">
+               excludes="${java.excludes.platform},com/sun/opengl/impl/nurbs/**"               source="${jogl.sourcelevel}" 
+               fork="yes"
+               memoryMaximumSize="128m"
+               debug="true" debuglevel="source,lines">
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
         </javac>
@@ -707,6 +728,13 @@
       <compiler id="compiler.cfg.solaris" name="suncc">
       </compiler>
 
+      <compiler id="compiler.cfg.solarisSparcv9" name="suncc">
+        <compilerarg value="-xchip=ultra" />
+        <compilerarg value="-xarch=v9a" />
+        <compilerarg value="-xcode=32" />
+      </compiler>
+
+
       <compiler id="compiler.cfg.win32.mingw" name="gcc">
         <defineset>
           <define name="_DEBUG"   if="c.compiler.use-debug"/>        
@@ -799,8 +827,24 @@
         <syslibset libs="GL, X11"/>
       </linker>
 
+
       <linker id="linker.cfg.solaris.drihack" name="suncc" />
 
+      <linker id="linker.cfg.solarisSparcv9" name="suncc">
+        <linkerarg value="-xarch=v9a" />
+        <syslibset dir="/usr/openwin/lib/sparcv9" libs="GL"/>
+        <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+      </linker>
+
+
+      <linker id="linker.cfg.solarisSparcv9.drihack" name="suncc" >
+       <linkerarg value="-xarch=v9a" />
+       <syslibset dir="/usr/openwin/lib/sparcv9" libs="GL"/>
+       <syslibset dir="/usr/openwin/lib/sparcv9" libs="GLU"/>
+       <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+      </linker>
+
+
       <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false">
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
         <syslibset libs="opengl32, glu32, gdi32, kernel32"/>
@@ -1415,11 +1459,20 @@
 
     <!--
         - Solaris (assuming Solaris CC)
+        - builds 32 bit sparc or 32 bit x86
       -->
     <target name="solaris">
       <antcall target="all" />
     </target>
 
+
+    <!--
+        - Solaris Sparcv9 (assuming Solaris CC)
+      -->
+    <target name="solarisSparcv9">
+      <antcall target="all" />
+    </target>
+
     <!--
        - Mac OSX
       -->
-- 
cgit v1.2.3