From 395327b755ff3616ae333fb487decf2194080bf9 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Tue, 11 Jul 2006 20:49:28 +0000
Subject: [PATCH] Linux: more 64 bit stuff

---
 build.xml                   | 8 +++++---
 src/java/org/lwjgl/Sys.java | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 913af555..84c0281a 100644
--- a/build.xml
+++ b/build.xml
@@ -118,9 +118,9 @@
 
 	<!-- Files to include in linux, glibc2.3 package -->
 	<patternset id="lwjgl-linux.fileset">
-		<include name="liblwjgl.so" />
+		<include name="liblwjgl*.so" />
 		<include name="libopenal.so" />    
-    		<include name="libjinput-linux.so" />
+		<include name="libjinput-linux.so" />
 	</patternset>
 	
 	<!-- Files to include in linux optional, glibc2.3 package -->
@@ -720,7 +720,9 @@
 	<!-- Compiles LWJGL on Linux platforms -->
 	<target name="-compile_native_linux" if="lwjgl.platform.linux">
 		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/liblwjgl.so" todir="${lwjgl.lib}/linux"/>
+		<copy todir="${lwjgl.lib}/linux">
+			<fileset dir="${lwjgl.bin}" includes="liblwjgl*.so"/>
+		</copy>
 	</target>
 
 	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java
index 644e266c..9083738c 100644
--- a/src/java/org/lwjgl/Sys.java
+++ b/src/java/org/lwjgl/Sys.java
@@ -78,11 +78,11 @@ public final class Sys {
 
 	private static void loadLibrary(final String lib_name) {
 		try {
-			loadLibrary(lib_name);
+			doLoadLibrary(lib_name);
 		} catch (UnsatisfiedLinkError e) {
 			if (implementation.has64Bit()) {
 				try {
-					loadLibrary(lib_name + POSTFIX64BIT);
+					doLoadLibrary(lib_name + POSTFIX64BIT);
 				} catch (UnsatisfiedLinkError e2) {
 					LWJGLUtil.log("Failed to load 64 bit library:" + e2.getMessage());
 				}