Fixed Issue 156: Patch to add linux.ia64 target

Applied patch from submitter.


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

3 files changed, 28 insertions, 2 deletions

diff --git a/make/build.xml b/make/build.xml
index 7ce104390..604c33849 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -202,6 +202,7 @@
         <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" />
+        <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
 	<condition property="cpu" value="sparc">
             <os name="SunOS" arch="sparc" />
         </condition>
@@ -321,6 +322,15 @@
         <property name="linker.cfg.id"                        value="linker.cfg.linux.amd64" /> 
     </target>
     
+    <target name="declare.linux.ia64" 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.ia64}" />       
+
+        <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
+        <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+    </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}" />
@@ -877,6 +887,9 @@
     <target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
     </target>
     
+    <target name="c.compile.jogl.linux.ia64" depends="declare.linux.ia64, c.build.jogl, c.build.cg" >
+    </target>
+
     <target name="c.compile.jogl.solaris" depends="declare.solaris, c.build.jogl">
     </target>
     
@@ -1036,7 +1049,7 @@
     <target name="all">
         <fail>
         
-Use a platform specific target:  linux, linux.amd64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
+Use a platform specific target:  linux, linux.amd64, linux.ia64, macosx, solaris, win32.vc6, win32.vc7, win32.mingw
         </fail>
     </target>      
 
@@ -1095,6 +1108,17 @@ Use a platform specific target:  linux, linux.amd64, macosx, solaris, win32.vc6,
         <antcall target="c.compile.jogl.linux.amd64" />
     </target>
 
+     <!--
+       - Linux on IA64 (assuming GCC)
+      -->
+    <target name="linux.ia64" depends="setup.java.home.dir.nonmacosx, declare.linux.ia64">
+        <!-- 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.ia64" />
+    </target>
+
     <!--
         - Solaris (assuming Solaris CC)
       -->
diff --git a/src/net/java/games/gluegen/GlueGen.java b/src/net/java/games/gluegen/GlueGen.java
index 6c343a5ee..1197741cb 100644
--- a/src/net/java/games/gluegen/GlueGen.java
+++ b/src/net/java/games/gluegen/GlueGen.java
@@ -144,7 +144,8 @@ public class GlueGen implements GlueEmitterControls {
       MachineDescription machDesc;
       String os = System.getProperty("os.name").toLowerCase();
       String cpu = System.getProperty("os.arch").toLowerCase();
-      if (os.startsWith("linux") && cpu.equals("amd64")) {
+      if ((os.startsWith("linux") && cpu.equals("amd64")) ||
+          (os.startsWith("linux") && cpu.equals("ia64"))) {
            machDesc = new MachineDescription64Bit();
       } else {
            machDesc = new MachineDescription32Bit();
diff --git a/src/net/java/games/gluegen/StructLayout.java b/src/net/java/games/gluegen/StructLayout.java
index ebbace6b5..df612c3b5 100644
--- a/src/net/java/games/gluegen/StructLayout.java
+++ b/src/net/java/games/gluegen/StructLayout.java
@@ -124,6 +124,7 @@ public class StructLayout {
     if ((os.startsWith("windows") && cpu.equals("x86")) ||
         (os.startsWith("linux") && cpu.equals("i386")) ||
         (os.startsWith("linux") && cpu.equals("amd64")) ||
+        (os.startsWith("linux") && cpu.equals("ia64")) ||
         (os.startsWith("sunos") && cpu.equals("sparc")) ||
         (os.startsWith("sunos") && cpu.equals("x86")) ||
         (os.startsWith("mac os") && cpu.equals("ppc")) ||