From 97522e9c738cc01dc0081454a71019a829eb2a5f Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Fri, 14 Apr 2006 16:54:31 +0000 Subject: 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 --- src/java/com/sun/gluegen/StructLayout.java | 1 + src/java/com/sun/gluegen/runtime/CPU.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/java/com/sun/gluegen') 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"))) { -- cgit v1.2.3