diff options
| author | Kenneth Russel <[email protected]> | 2008-07-08 17:55:10 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-07-08 17:55:10 +0000 |
| commit | aa1a3b6381b79fa1caa43bd6169244f1cff23500 (patch) | |
| tree | df98e1f8de0a6c153947df69cabb1b266a0a3d26 | |
| parent | b43bba3824d2b4b2c981c2c4fd392c6f946b7709 (diff) | |
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
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 12 |
1 files 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> |