* 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

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

View File

@ -360,6 +360,12 @@ public final class NativeLibraryLoader {
String fileNameInJarWithoutExtension
= 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 dummyLib = System.mapLibraryName("");
if (dummyLib.contains(".")) {

Binary file not shown.