Преглед на файлове

* 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

shadowislord преди 11 години
родител
ревизия
36483c4b49
променени са 2 файла, в които са добавени 6 реда и са изтрити 0 реда
  1. 6 0
      jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java
  2. BIN
      jme3-examples/libbulletjme64.so

+ 6 - 0
jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java

@@ -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(".")) {

BIN
jme3-examples/libbulletjme64.so