diff options
| author | Gerard Ziemski <[email protected]> | 2005-10-06 02:46:15 +0000 |
|---|---|---|
| committer | Gerard Ziemski <[email protected]> | 2005-10-06 02:46:15 +0000 |
| commit | 7187c9960c78b2356dc7b69fec489f4757db5e99 (patch) | |
| tree | f55d2b75eb5512e257c1c4aea32797d90611f088 /make | |
| parent | 79bd75920f2e77d076acfebc20c0c8d5a529c3ca (diff) | |
add support for Mac OS X fat library (ppc and i386)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@392 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 15 | ||||
| -rwxr-xr-x | make/lib/cpptasks.jar | bin | 0 -> 345356 bytes |
2 files changed, 14 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index f707e43d7..56cf542e0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -25,6 +25,7 @@ - Public targets: - linux - macosx + - macosxfat (ppc & i386 - requires Intel Transition Development Kit or fat Mac OS X) - solaris - win32.vc6 - win32.vc7 @@ -672,7 +673,7 @@ --> <!-- import cpptasks --> - <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${basedir}/lib/cpptasks-cvs-040628.jar"/> + <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${basedir}/lib/cpptasks.jar"/> <!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml"/--> <target name="c.configure"> @@ -723,6 +724,10 @@ </compiler> <compiler id="compiler.cfg.macosx" name="gcc"> + <compilerarg value="-arch" if="macosxfat"/> + <compilerarg value="ppc" if="macosxfat"/> + <compilerarg value="-arch" if="macosxfat"/> + <compilerarg value="i386" if="macosxfat"/> <compilerarg value="-Wmost" /> <compilerarg value="-ObjC" /> <defineset> @@ -767,6 +772,10 @@ </linker> <linker id="linker.cfg.macosx" name="gcc"> + <linkerarg value="-arch" if="macosxfat"/> + <linkerarg value="ppc" if="macosxfat"/> + <linkerarg value="-arch" if="macosxfat"/> + <linkerarg value="i386" if="macosxfat"/> <linkerarg value="-framework" /> <linkerarg value="Cocoa" /> <linkerarg value="-framework" /> @@ -1139,6 +1148,10 @@ Use a platform specific target: linux, linux.amd64, linux.ia64, macosx, solaris <!-- Compile the native C sources and build the jogl lib. --> <antcall target="c.compile.jogl.macosx" /> </target> + <target name="macosxfat" depends="macosx"> + <property name="macosxfat" value="true" /> + <antcall target="macosx" inheritRefs="true" /> + </target> <!-- - FreeBSD (assuming GCC) diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar Binary files differnew file mode 100755 index 000000000..005691c09 --- /dev/null +++ b/make/lib/cpptasks.jar |