From 18e6e1f95fccaee236465540baec2dec400687f3 Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Sun, 19 Jun 2011 20:18:02 +0000
Subject: [PATCH] Applying 64bit loading patch by Matthias

---
 src/java/org/lwjgl/Sys.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java
index 039bfab2..b5263826 100644
--- a/src/java/org/lwjgl/Sys.java
+++ b/src/java/org/lwjgl/Sys.java
@@ -78,6 +78,19 @@ public final class Sys {
 	}
 
 	private static void loadLibrary(final String lib_name) {
+		// actively try to load 64bit libs on 64bit architectures first
+		String osArch = System.getProperty("os.arch");
+		boolean is64bit = "amd64".equals(osArch) || "x86_64".equals(osArch);
+		if(is64bit) {
+			try {
+				doLoadLibrary(lib_name + POSTFIX64BIT);
+				return;
+			} catch (UnsatisfiedLinkError e) {
+				LWJGLUtil.log("Failed to load 64 bit library: " + e.getMessage());
+			}
+		}
+		
+		// fallback to loading the "old way"
 		try {
 			doLoadLibrary(lib_name);
 		} catch (UnsatisfiedLinkError e) {