Fixed Mac OS X build after recent JAWT changes in 10.3 (which are

apparently going to be brought back to the 10.2 Java on OS X as well).
Renamed host.properties to jogl.properties and changed build to look
for this file in user's home directory to avoid needing to always
change a file that is in the repository. Updated build documentation.


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

6 files changed, 21 insertions, 16 deletions

diff --git a/make/build.xml b/make/build.xml
index e3ce6476f..f1352a2f2 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -70,7 +70,7 @@
         <!-- Load the user specified properties file that defines various host
            - specific paths.  The user will be notified if this is does not
            - exist. -->
-        <property name="user.properties.file" value="${make}/host.properties" />
+        <property name="user.properties.file" value="${user.home}/jogl.properties" />
         <property file="${user.properties.file}" />
         <echo message="Loaded ${user.properties.file}." />
         <echo message="antlr.jar=${antlr.jar}" />
@@ -410,7 +410,10 @@
         <!-- Set up gcc -->
         <property name="c.compiler" value="gcc" />
         <property name="c.compiler.optflags" value="-O2 -Dmacosx" />
-        <property name="c.compiler.flags" value="${c.compiler.optflags} -c -o" />
+	<!-- Note: specifying -ObjC for all files is sloppy (only needed for      -->
+	<!-- JAWT-related .c files) but this doesn't break anything and is easier -->
+	<!-- than rewriting the whole Makefile                                    -->
+        <property name="c.compiler.flags" value="${c.compiler.optflags} -ObjC -c -o" />
         <property name="c.compiler.obj.suffix" value="o" />
 	<property name="c.compiler.jogl.outputfile.expr" value="${rootrel.obj.jogl}/*.${c.compiler.obj.suffix}" />
 	<property name="c.compiler.includes" value="-I&quot;make/stub_includes/opengl&quot; -I&quot;${java.includes.dir}&quot; -I&quot;${java.includes.dir.platform}&quot; -I&quot;make/stub_includes/cg&quot;" />
diff --git a/make/jawt-macosx.cfg b/make/jawt-macosx.cfg
index 6c6f849a9..92ec9b49e 100644
--- a/make/jawt-macosx.cfg
+++ b/make/jawt-macosx.cfg
@@ -9,8 +9,8 @@ NativeOutputDir ../build/gensrc/native/jogl
 HierarchicalNativeOutput false
 
 Opaque boolean jboolean
-Opaque long CGContextRef
 Opaque long void *
+Opaque long NSView *
 
 IgnoreField JAWT GetComponent
 IgnoreField JAWT_DrawingSurfaceInfo      platformInfo
diff --git a/make/host.properties b/make/jogl.properties
index da187e3f1..ce7f4be13 100644
--- a/make/host.properties
+++ b/make/jogl.properties
@@ -1,7 +1,7 @@
 ###############################################################################
-#
 # The host specific properties.  The build will inform you of required
-# properties.
+# properties.  This file must be copied into your home directory (pointed
+# to by the Java system property user.home) and the copy modified appropriately.
 ###############################################################################
 #
 # java.home.dir is usually inferred from the java.home variable.
@@ -16,7 +16,7 @@
 # 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
 # Mac OS X
diff --git a/make/stub_includes/macosx/AppKit/NSView.h b/make/stub_includes/macosx/AppKit/NSView.h
new file mode 100644
index 000000000..5d3acf658
--- /dev/null
+++ b/make/stub_includes/macosx/AppKit/NSView.h
@@ -0,0 +1 @@
+typedef struct _NSView NSView;
diff --git a/make/stub_includes/macosx/ApplicationServices/ApplicationServices.h b/make/stub_includes/macosx/ApplicationServices/ApplicationServices.h
deleted file mode 100644
index 9ee6f78d1..000000000
--- a/make/stub_includes/macosx/ApplicationServices/ApplicationServices.h
+++ /dev/null
@@ -1 +0,0 @@
-typedef struct _CGContextRef * CGContextRef;
diff --git a/make/validate-properties.xml b/make/validate-properties.xml
index e5ed6889c..3a4ccd741 100644
--- a/make/validate-properties.xml
+++ b/make/validate-properties.xml
@@ -12,11 +12,12 @@
     <target name="antlr.jar.validate" unless="antlr.jar">
         <fail>
         
-    **************************************************************
-    ** The property &quot;antlr.jar&quot; was not set in host.properties. **
-    ** Please set &quot;antlr.jar&quot; to the full path of the ANTLR jar **
-    ** including the jar itself.                                **
-    **************************************************************
+    *****************************************************************
+    ** The property &quot;antlr.jar&quot; was not set in the jogl.properties **
+    ** file that should be in your home directory (${user.home}).    **
+    ** Please set &quot;antlr.jar&quot; to the full path of the ANTLR jar    **
+    ** including the jar itself.                                   **
+    *****************************************************************
         </fail>
     </target>
 
@@ -28,10 +29,11 @@
     <target name="java.home.dir.validate" unless="java.home.dir">
         <fail>
         
-    ******************************************************************
-    ** The property &quot;java.home.dir&quot; was not set in host.properties. **
-    ** Please set &quot;java.home.dir&quot; to your JAVA_HOME directory.      **
-    ******************************************************************
+    *********************************************************************
+    ** The property &quot;java.home.dir&quot; was not set in the jogl.properties **
+    ** file that should be in your home directory (${user.home}).       **
+    ** Please set &quot;java.home.dir&quot; to your JAVA_HOME directory.         **
+    *********************************************************************
         </fail>
     </target>