summaryrefslogtreecommitdiffstats
path: root/src/java/com
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-04-14 16:54:31 +0000
committerKenneth Russel <[email protected]>2006-04-14 16:54:31 +0000
commit97522e9c738cc01dc0081454a71019a829eb2a5f (patch)
tree5fd107f8c5526a41ec0847d59bd68944742ce02b /src/java/com
parent32ae0b958e9a2daefc2a278af28050929a95dddb (diff)
Added patch from user mabraham on javagaming.org forums for building
on Windows 64-bit git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@28 a78bb65f-1512-4460-ba86-f6dc96a7bf27
Diffstat (limited to 'src/java/com')
-rw-r--r--src/java/com/sun/gluegen/StructLayout.java1
-rwxr-xr-xsrc/java/com/sun/gluegen/runtime/CPU.java3
2 files changed, 3 insertions, 1 deletions
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"))) {