[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2480] trunk/LWJGL

[<eli...@us...>]

Revision: 2480
Author:   elias_naur
Date:     2006-07-11 13:49:28 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2480&view=rev

Log Message:
-----------
Linux: more 64 bit stuff

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 20:30:19 UTC (rev 2479)
+++ trunk/LWJGL/build.xml	2006-07-11 20:49:28 UTC (rev 2480)
@@ -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">

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:30:19 UTC (rev 2479)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:49:28 UTC (rev 2480)
@@ -78,11 +78,11 @@
 
 	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());
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.