diff options
| -rw-r--r-- | make/build.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index ad761b54a..e9ae97653 100644 --- a/make/build.xml +++ b/make/build.xml @@ -384,7 +384,7 @@ <property name="glu.cfg" value="${config}/glu.cfg" /> <property name="glu.impl.cfg" value="${config}/glu-impl-macosx.cfg" /> <property name="jawt.cfg" value="${config}/jawt-macosx.cfg" /> - <property name="window.cfg" value="${config}/glx-macosx.cfg" /> + <property name="window.cfg" value="${config}/cgl-macosx.cfg" /> <property name="is.macosx" value="true" /> <!-- Set platform directories. --> @@ -408,7 +408,7 @@ <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"" /> <property name="c.linker" value="gcc" /> <property name="c.linker.flags" value="-bundle" /> - <property name="c.linker.jogl.libs" value="-framework Cocoa -framework OpenGL -ljawt" /> + <property name="c.linker.jogl.libs" value="-L"${java.lib.dir.platform}" -framework Cocoa -framework OpenGL -ljawt" /> <property name="rootrel.c.linker.jogl.dso" value="${rootrel.obj}/libjogl.jnilib" /> <property name="c.linker.jogl.dso" value="${project.root}/${rootrel.c.linker.jogl.dso}" /> <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> @@ -708,11 +708,11 @@ <target name="c.compile.jogl.check.nonmacosx" unless="is.macosx"> <condition property="c.compile.jogl.skip"> <and> - <uptodate id="uptodate.c"> + <uptodate> <srcfiles dir="${project.root}" includes="${rootrel.src.c}/*.c" /> <mapper type="glob" from="${rootrel.src.c}${sep}*.c" to="${rootrel.obj.jogl}${sep}*.${c.compiler.obj.suffix}" /> </uptodate> - <uptodate id="uptodate.generated.c"> + <uptodate> <srcfiles dir="${project.root}" includes="${rootrel.generated.c.jogl}/*.c" /> <mapper type="glob" from="${rootrel.generated.c.jogl}${sep}*.c" to="${rootrel.obj.jogl}${sep}*.${c.compiler.obj.suffix}" /> </uptodate> @@ -723,8 +723,14 @@ <target name="c.compile.jogl.check.macosx" if="is.macosx"> <condition property="c.compile.jogl.skip"> <and> - <uptodate refid="uptodate.c" /> - <uptodate refid="uptodate.generated.c" /> + <uptodate> + <srcfiles dir="${project.root}" includes="${rootrel.src.c}/*.c" /> + <mapper type="glob" from="${rootrel.src.c}${sep}*.c" to="${rootrel.obj.jogl}${sep}*.${c.compiler.obj.suffix}" /> + </uptodate> + <uptodate> + <srcfiles dir="${project.root}" includes="${rootrel.generated.c.jogl}/*.c" /> + <mapper type="glob" from="${rootrel.generated.c.jogl}${sep}*.c" to="${rootrel.obj.jogl}${sep}*.${c.compiler.obj.suffix}" /> + </uptodate> <uptodate> <srcfiles dir="${project.root}" includes="${rootrel.src.c}/*.m" /> <mapper type="glob" from="${rootrel.src.c}${sep}*.m" to="${rootrel.obj.jogl}${sep}*.${c.compiler.obj.suffix}" /> |