From 7187c9960c78b2356dc7b69fec489f4757db5e99 Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gerard.ziemski@sun.com>
Date: Thu, 6 Oct 2005 02:46:15 +0000
Subject: 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
---
 make/build.xml        |  15 ++++++++++++++-
 make/lib/cpptasks.jar | Bin 0 -> 345356 bytes
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100755 make/lib/cpptasks.jar

(limited to 'make')

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
new file mode 100755
index 000000000..005691c09
Binary files /dev/null and b/make/lib/cpptasks.jar differ
-- 
cgit v1.2.3