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

- remove adding for 64 ending for natives

Browse Source
This commit is contained in:
Normen Hansen 2015-01-27 11:49:06 +01:00
parent c90e50bb2e
commit 50134899f8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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