diff options
| author | Kenneth Russel <[email protected]> | 2003-08-24 07:22:23 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2003-08-24 07:22:23 +0000 |
| commit | 1c3f7039b1579e0184a532eaade04dd7bc2c9dae (patch) | |
| tree | 539a1ea4ddccccbaa329c236957ff4bf583a7986 /make/build.xml | |
| parent | 4195f8984ec08d9c5d4a4794728a046af9f0924b (diff) | |
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
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 7 |
1 files changed, 5 insertions, 2 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"make/stub_includes/opengl" -I"${java.includes.dir}" -I"${java.includes.dir.platform}" -I"make/stub_includes/cg"" /> |