diff options
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 15 | ||||
| -rw-r--r-- | src/java/com/sun/gluegen/StructLayout.java | 1 | ||||
| -rwxr-xr-x | src/java/com/sun/gluegen/runtime/CPU.java | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index d18a29f..d4b9002 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -49,6 +49,8 @@ - isVC6 - isVC7 - isVC8 + - isVC8_X64 + - isVC8Family (= isVC8 || isVC8_X64) - isMingW --> <project name="GlueGen-cpptasks" basedir="."> @@ -160,6 +162,18 @@ <equals arg1="${win32.c.compiler}" arg2="vc8" /> </and> </condition> + <condition property="isVC8_X64"> + <and> + <istrue value="${isWindows}" /> + <equals arg1="${win32.c.compiler}" arg2="vc8_x64" /> + </and> + </condition> + <condition property="isVC8Family"> + <or> + <istrue value="${isVC8}" /> + <istrue value="${isVC8_X64}" /> + </or> + </condition> <condition property="isMingW"> <and> <istrue value="${isWindows}" /> @@ -172,6 +186,7 @@ <isfalse value="${isVC6}" /> <isfalse value="${isVC7}" /> <isfalse value="${isVC8}" /> + <isfalse value="${isVC8_X64}" /> <isfalse value="${isMingW}" /> </and> </condition> diff --git a/src/java/com/sun/gluegen/StructLayout.java b/src/java/com/sun/gluegen/StructLayout.java index 8dc4001..b3a6ac5 100644 --- a/src/java/com/sun/gluegen/StructLayout.java +++ b/src/java/com/sun/gluegen/StructLayout.java @@ -124,6 +124,7 @@ public class StructLayout { String os = System.getProperty("os.name").toLowerCase(); String cpu = System.getProperty("os.arch").toLowerCase(); if ((os.startsWith("windows") && cpu.equals("x86")) || + (os.startsWith("windows") && cpu.equals("amd64")) || (os.startsWith("linux") && cpu.equals("i386")) || (os.startsWith("linux") && cpu.equals("amd64")) || (os.startsWith("linux") && cpu.equals("x86_64")) || diff --git a/src/java/com/sun/gluegen/runtime/CPU.java b/src/java/com/sun/gluegen/runtime/CPU.java index d22d7b5..ce187e4 100755 --- a/src/java/com/sun/gluegen/runtime/CPU.java +++ b/src/java/com/sun/gluegen/runtime/CPU.java @@ -62,7 +62,8 @@ public class CPU { (os.startsWith("freebsd") && cpu.equals("i386")) || (os.startsWith("hp-ux") && cpu.equals("pa_risc2.0"))) { is32Bit = true; - } else if ((os.startsWith("linux") && cpu.equals("amd64")) || + } else if ((os.startsWith("windows") && cpu.equals("amd64")) || + (os.startsWith("linux") && cpu.equals("amd64")) || (os.startsWith("linux") && cpu.equals("x86_64")) || (os.startsWith("linux") && cpu.equals("ia64")) || (os.startsWith("sunos") && cpu.equals("amd64"))) { |