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

* Fix jinput native library loading - now the JNI library name is based on the name in the jar

Browse Source
This commit is contained in:
shadowislord 2014-06-06 21:05:15 -04:00
parent 54ffe15dda
commit 48ccb0fe56
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,19 +355,20 @@ public final class NativeLibraryLoader {
// Determine what filename it should be extracted as. // Determine what filename it should be extracted as.
String loadedAsFileName; String loadedAsFileName;
if (library.isJNI()) { if (library.isJNI()) {
String nameWithArch;
// Append "64" to path
// so that we don't overwrite the 32-bit version.
if (platform.is64Bit()) {
nameWithArch = name + "64";
} else {
nameWithArch = name;
}
// JNI libraries on Mac / JDK6 use jnilib extension. // JNI libraries on Mac / JDK6 use jnilib extension.
// JNI libraries on Mac / JDK7 use dylib extension. // JNI libraries on Mac / JDK7 use dylib extension.
loadedAsFileName = System.mapLibraryName(nameWithArch); String fileNameInJarWithoutExtension
= fileNameInJar.substring(0, fileNameInJar.lastIndexOf("."));
String systemJniExtension;
String dummyLib = System.mapLibraryName("");
if (dummyLib.contains(".")) {
systemJniExtension = dummyLib.substring(dummyLib.lastIndexOf("."));
} else {
systemJniExtension = "";
}
loadedAsFileName = fileNameInJarWithoutExtension + systemJniExtension;
} else { } else {
// Not a JNI library. // Not a JNI library.
// Just use the original filename as it is in the JAR. // Just use the original filename as it is in the JAR.