diff options
author | Travis Bryson <[email protected]> | 2006-04-25 01:32:05 +0000 |
---|---|---|
committer | Travis Bryson <[email protected]> | 2006-04-25 01:32:05 +0000 |
commit | 23531e433b5aadfe2344b499600c4bd2d2088ac6 (patch) | |
tree | 99becacb4984d77a64d301b1e6a284fdb736372e /make | |
parent | 2aa23056d44c96db88d7cab700243886f6c00304 (diff) |
Issue number:
Obtained from:
Submitted by:
Reviewed by:
Add proper 64 bit Sparcv9 detection. These changes are necessary for 64
bit JOGL build on sparc solaris.
Modified Files:
make/gluegen-cpptasks.xml
src/java/com/sun/gluegen/StructLayout.java
src/java/com/sun/gluegen/runtime/CPU.java
----------------------------------------------------------------------
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@30 a78bb65f-1512-4460-ba86-f6dc96a7bf27
Diffstat (limited to 'make')
-rwxr-xr-x | make/gluegen-cpptasks.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index d4b9002..0eaa66a 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -38,6 +38,7 @@ - isLinuxX86 - isOSX - isSolaris + - isSolarisSparcv9 - isUnix - isWindows - isX11 @@ -77,7 +78,14 @@ <os name="Linux" /> </condition> <condition property="isSolaris"> - <os name="SunOS" /> + <and> + <os name="SunOS" /> + <or> + <os arch="i386" /> + <os arch="x86" /> + <os arch="sparc" /> + </or> + </and> </condition> <condition property="isWindows"> <os family="windows" /> @@ -115,6 +123,12 @@ <condition property="isIA64"> <os arch="IA64" /> </condition> + <condition property="isSolarisSparcv9"> + <and> + <os name="SunOS" /> + <os arch="sparcv9" /> + </and> + </condition> <!-- Note: assumes X11 platform by default --> <condition property="isX11"> <and> @@ -132,6 +146,7 @@ <echo message="LinuxX86=${isLinuxX86}" /> <echo message="OS X=${isOSX}" /> <echo message="Solaris=${isSolaris}" /> + <echo message="SolarisSparcv9=${isSolarisSparcv9}" /> <echo message="Unix=${isUnix}" /> <echo message="Windows=${isWindows}" /> <echo message="X11=${isX11}" /> |