sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Avoid conflicts when extracting both 64-bit and 32-bit libraries to the same folder .. This is mainly for the bulletjme library which doesn't specify "64" at the end of the filename

Browse Source
This commit is contained in:
shadowislord 2014-06-06 21:18:50 -04:00
parent 34826360d6
commit 36483c4b49
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java
View File

@ -360,6 +360,12 @@ public final class NativeLibraryLoader {
String fileNameInJarWithoutExtension String fileNameInJarWithoutExtension
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf(".")); = fileNameInJar.substring(0, fileNameInJar.lastIndexOf("."));
if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) {
// This is to avoid conflicts with 32-bit versions of the
// same library when extracting.
fileNameInJarWithoutExtension += "64";
}
String systemJniExtension; String systemJniExtension;
String dummyLib = System.mapLibraryName(""); String dummyLib = System.mapLibraryName("");
if (dummyLib.contains(".")) { if (dummyLib.contains(".")) {

BIN
jme3-examples/libbulletjme64.so Normal file
View File

Binary file not shown.