diff options
| author | Kenneth Russel <[email protected]> | 2004-10-26 17:35:49 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-10-26 17:35:49 +0000 |
| commit | 66a192f88f79b8812d9ee53d55da106eaef925c3 (patch) | |
| tree | 621373bfc2bb9bbdae68b59f947c52567f04e7db /make | |
| parent | cd32bbb2a9f29a598745a768a01c21a9b4dabbe1 (diff) | |
Added build support for Cg library on Mac OS X
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@159 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 11 | ||||
| -rw-r--r-- | make/jogl.properties | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index cd97c6a6b..72ff83472 100644 --- a/make/build.xml +++ b/make/build.xml @@ -731,6 +731,8 @@ <linkerarg value="Cocoa" /> <linkerarg value="-framework" /> <linkerarg value="OpenGL" /> + <linkerarg value="-framework" if="c.compiler.use-cglib" /> + <linkerarg value="Cg" if="c.compiler.use-cglib" /> </linker> <patternset id="c.src.files.jogl"> @@ -798,6 +800,12 @@ <move file="${obj}/libjogl.dylib" tofile="${obj}/libjogl.jnilib" /> </target> + <target name="c.rename.jogl_cg.lib" if="os.isMacOSX"> + <!-- FIXME: this is a hack; the cpptask should have an option to change the + suffix or at least understand the override from dylib to jnilib --> + <move file="${obj}/libjogl_cg.dylib" tofile="${obj}/libjogl_cg.jnilib" /> + </target> + <target name="c.build.jogl"> <antcall target="c.build" inheritRefs="true"> <param name="c.compiler.src.files" value="c.src.files.jogl"/> @@ -812,6 +820,7 @@ <param name="c.compiler.use-cglib" value="XXX"/> <param name="output.lib.name" value="jogl_cg"/> </antcall> + <antcall target="c.rename.jogl_cg.lib" inheritRefs="true" /> </target> @@ -831,7 +840,7 @@ <target name="c.compile.jogl.solaris" depends="declare.solaris, c.build.jogl"> </target> - <target name="c.compile.jogl.macosx" depends="declare.macosx, c.build.jogl"> + <target name="c.compile.jogl.macosx" depends="declare.macosx, c.build.jogl, c.build.cg"> </target> <!-- ================================================================== --> diff --git a/make/jogl.properties b/make/jogl.properties index bd081e484..8c945540d 100644 --- a/make/jogl.properties +++ b/make/jogl.properties @@ -53,4 +53,4 @@ vc7.root=C:/Program Files/Microsoft Visual Studio .NET/Vc7 # windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib x11.cg.lib=/usr/lib -macosx.cg.lib=FIXME: install Cg toolkit and enter default path + |