michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: more 64 bit stuff

This commit is contained in:
Elias Naur 2006-07-11 20:49:28 +00:00
parent e2bbb739aa
commit 395327b755
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@ -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">

4
src/java/org/lwjgl/Sys.java
View File

@ -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());
}