diff options
| author | Kenneth Russel <[email protected]> | 2006-01-15 20:32:29 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-01-15 20:32:29 +0000 |
| commit | 97cf09e0ff4e3df5a1b4543e322bda83dca2e773 (patch) | |
| tree | fd4a18852fb8cfdfaeda67f9656d461949d440e7 | |
| parent | df0f5636884b212bcc7a2d9b1b61c195bba79621 (diff) | |
Fixed build breakage on Linux after recent build changes
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@4 a78bb65f-1512-4460-ba86-f6dc96a7bf27
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index 8d10498..468d46a 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -31,14 +31,14 @@ - - isFreeBSD - isIA64 - - isOSX - isLinux - isLinuxAMD64 - isLinuxIA64 - isLinuxX86 + - isOSX - isSolaris - - isWindows - isUnix + - isWindows - isX11 - - The gluegen.cpptasks.detect.compiler target sets the following @@ -85,7 +85,10 @@ <condition property="isLinuxX86"> <and> <istrue value="${isLinux}" /> - <os arch="x86" /> + <or> + <os arch="i386" /> + <os arch="x86" /> + </or> </and> </condition> <condition property="isLinuxAMD64"> @@ -111,15 +114,16 @@ </and> </condition> - <echo message="OS X=${isOSX}" /> - <echo message="Windows=${isWindows}" /> - <echo message="Unix=${isUnix}" /> - <echo message="Linux=${isLinux}" /> - <echo message="Solaris=${isSolaris}" /> <echo message="FreeBSD=${isFreeBSD}" /> + <echo message="IA64=${isIA64}" /> + <echo message="Linux=${isLinux}" /> <echo message="LinuxAMD64=${isLinuxAMD64}" /> <echo message="LinuxIA64=${isLinuxIA64}" /> - <echo message="IA64=${isIA64}" /> + <echo message="LinuxX86=${isLinuxX86}" /> + <echo message="OS X=${isOSX}" /> + <echo message="Solaris=${isSolaris}" /> + <echo message="Unix=${isUnix}" /> + <echo message="Windows=${isWindows}" /> <echo message="X11=${isX11}" /> <property name="gluegen.cpptasks.detected.os" value="true" /> |