diff options
| -rw-r--r-- | doc/HowToBuild.html | 2 | ||||
| -rw-r--r-- | make/build.xml | 7 | ||||
| -rw-r--r-- | make/jawt-macosx.cfg | 2 | ||||
| -rw-r--r-- | make/jogl.properties (renamed from make/host.properties) | 6 | ||||
| -rw-r--r-- | make/stub_includes/macosx/AppKit/NSView.h | 1 | ||||
| -rw-r--r-- | make/stub_includes/macosx/ApplicationServices/ApplicationServices.h | 1 | ||||
| -rw-r--r-- | make/validate-properties.xml | 20 | ||||
| -rw-r--r-- | src/net/java/games/gluegen/ant/GlueGenTask.java | 1 |
8 files changed, 23 insertions, 17 deletions
diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html index 69a3df2ad..59a4aa360 100644 --- a/doc/HowToBuild.html +++ b/doc/HowToBuild.html @@ -17,7 +17,7 @@ OpenGL binding from a fresh copy of the source distribution: <LI> <B>Unset your CLASSPATH environment variable:</B> <br> The Ant build requires that the Jogl jars not be visible on the classpath. On Unix, type <code> unsetenv CLASSPATH </code> into a csh or tcsh shell, or <code> set CLASSPATH=; export CLASSPATH </code> into a Bourne shell. On Windows, type <code> set CLASSPATH= </code> into a command prompt. - <LI> <B>Edit host.properties:</B> <br> Change any settings in the <b>make/host.properties</b> file that are necessary, in particular the location of the ANTLR jar file (typically <b>$HOME/antlr-2.7.2/antlr.jar</b>). + <LI> <B>Copy and edit jogl.properties:</B> <br> Copy <b>make/jogl.properties</b> into your home directory (pointed to by the Java system property <b>user.home</b>). Edit the copy to change any settings that are necessary, in particular the location of the ANTLR jar file (typically <b>$HOME/antlr-2.7.2/antlr.jar</b>). <LI> <B>Build the source tree:</B> <br> Open a command shell in the "make" directory of the source tree and type "ant [target]", where [target] is one of <code>linux</code>, <code>macosx</code>, <code>solaris</code>, <code>win32.vc6</code>, <code>win32.vc7</code>, or <code>win32.mingw</code>. <UL> 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"make/stub_includes/opengl" -I"${java.includes.dir}" -I"${java.includes.dir.platform}" -I"make/stub_includes/cg"" /> 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 "antlr.jar" was not set in host.properties. ** - ** Please set "antlr.jar" to the full path of the ANTLR jar ** - ** including the jar itself. ** - ************************************************************** + ***************************************************************** + ** The property "antlr.jar" was not set in the jogl.properties ** + ** file that should be in your home directory (${user.home}). ** + ** Please set "antlr.jar" 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 "java.home.dir" was not set in host.properties. ** - ** Please set "java.home.dir" to your JAVA_HOME directory. ** - ****************************************************************** + ********************************************************************* + ** The property "java.home.dir" was not set in the jogl.properties ** + ** file that should be in your home directory (${user.home}). ** + ** Please set "java.home.dir" to your JAVA_HOME directory. ** + ********************************************************************* </fail> </target> diff --git a/src/net/java/games/gluegen/ant/GlueGenTask.java b/src/net/java/games/gluegen/ant/GlueGenTask.java index 531f1198e..c9849c29d 100644 --- a/src/net/java/games/gluegen/ant/GlueGenTask.java +++ b/src/net/java/games/gluegen/ant/GlueGenTask.java @@ -147,6 +147,7 @@ public class GlueGenTask extends Task // set the VM and classname in the commandline gluegenCommandline.setVm(JavaEnvUtils.getJreExecutable("java")); gluegenCommandline.setClassname(GLUE_GEN); + // gluegenCommandline.createVmArgument().setValue("-verbose:class"); } // ========================================================================= |