From aa1a3b6381b79fa1caa43bd6169244f1cff23500 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Tue, 8 Jul 2008 17:55:10 +0000
Subject: Added ability to override macosx64 with a "false" value in a
 containing build.xml

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/branches/JOGL_2_SANDBOX@100 a78bb65f-1512-4460-ba86-f6dc96a7bf27
---
 make/gluegen-cpptasks.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 59bee5d..631d0e3 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -134,6 +134,10 @@
         <os family="unix"/>
       </and>
     </condition>
+    <!-- Need a way to be able to disable the macosx64 property specification in a build.xml -->
+    <condition property="use.macosx64">
+      <istrue value="${macosx64}" />
+    </condition>
     <condition property="isUnix">
       <and>
         <os family="unix" />
@@ -502,8 +506,8 @@
       <compilerarg value="ppc" />
       <compilerarg value="-arch" />
       <compilerarg value="i386" />
-      <compilerarg value="-arch" if="macosx64"/>
-      <compilerarg value="x86_64" if="macosx64"/>
+      <compilerarg value="-arch" if="use.macosx64"/>
+      <compilerarg value="x86_64" if="use.macosx64"/>
       <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
       <compilerarg value="-Wmost" />
       <compilerarg value="-ObjC" />
@@ -573,8 +577,8 @@
       <linkerarg value="ppc" />
       <linkerarg value="-arch" />
       <linkerarg value="i386" />
-      <linkerarg value="-arch" if="macosx64"/>
-      <linkerarg value="x86_64" if="macosx64"/>
+      <linkerarg value="-arch" if="use.macosx64"/>
+      <linkerarg value="x86_64" if="use.macosx64"/>
       <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
     </linker>
 
-- 
cgit v1.2.3