Fixed bugs in Solaris build.

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

3 files changed, 16 insertions, 7 deletions

diff --git a/make/build.xml b/make/build.xml
index 5635c2353..7811a86b3 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -180,7 +180,13 @@
         <property name="java.includes.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" />
         <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.solaris" value="${java.home.dir}/jre/lib/${os.arch}" />
+	<condition property="cpu" value="sparc">
+            <os name="SunOS" arch="sparc" />
+        </condition>
+	<condition property="cpu" value="i386">
+            <os name="SunOS" arch="x86" />
+        </condition>
+        <property name="java.lib.dir.solaris" value="${java.home.dir}/jre/lib/${cpu}" />
         <property name="java.lib.dir.macosx" value="/System/Library/Frameworks/JavaVM.framework/Libraries" />
         <property name="gl.headers" value="${stub.includes.dir}/opengl/**/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
 
@@ -995,9 +1001,11 @@
         <jar destfile="${jogl.dist.dir}/jogl-natives-solsparc.jar"
              basedir="${jogl.dist.dir}/jogl-solsparc"
              includes="libjogl.so" />
-        <jar destfile="${jogl.dist.dir}/jogl-natives-solx86.jar"
+        <!-- Note: Solaris/x86 elided for now as it requires Mesa to
+             be installed -->
+        <!-- jar destfile="${jogl.dist.dir}/jogl-natives-solx86.jar"
              basedir="${jogl.dist.dir}/jogl-solx86"
-             includes="libjogl.so" />
+             includes="libjogl.so" -->
     </target>
 
     <!-- ================================================================== -->
@@ -1074,7 +1082,7 @@ Use a platform specific target:  win32.vc6, win32.vc7, win32.mingw, linux, macos
     <!--
        - Solaris (assuming Solaris CC)
       -->
-    <target name="solaris" depends="setup.java.home.dir.nonmacosx, declare.linux">
+    <target name="solaris" depends="setup.java.home.dir.nonmacosx, declare.solaris">
         <!-- Generate, compile, and build the jar for the Java sources. -->
         <antcall target="jar" inheritRefs="true" />
 
diff --git a/make/host.properties b/make/host.properties
index b88cd68ca..122af2159 100644
--- a/make/host.properties
+++ b/make/host.properties
@@ -16,9 +16,10 @@
 # including the name of the jar
 #
 # Windows
-antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar
+# antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar
 # Linux
-# antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar
+# antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
+antlr.jar=/net/animorphic/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
 # Mac OS X
 # antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
 
diff --git a/src/net/java/games/gluegen/StructLayout.java b/src/net/java/games/gluegen/StructLayout.java
index 2a500ceae..4f5b76f1c 100644
--- a/src/net/java/games/gluegen/StructLayout.java
+++ b/src/net/java/games/gluegen/StructLayout.java
@@ -124,7 +124,7 @@ public class StructLayout {
     if ((os.startsWith("windows") && cpu.equals("x86")) ||
         (os.startsWith("linux") && cpu.equals("i386")) ||
         (os.startsWith("sunos") && cpu.equals("sparc")) ||
-        (os.startsWith("sunos") && cpu.equals("i386"))||
+        (os.startsWith("sunos") && cpu.equals("x86"))||
         (os.startsWith("mac os") && cpu.equals("ppc"))
 	) {
       // FIXME: make struct alignment configurable? May need to change