Sfoglia il codice sorgente

- remove adding for 64 ending for natives

Normen Hansen 10 anni fa
parent
commit
50134899f8

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

@@ -385,9 +385,9 @@ public final class NativeLibraryLoader {
             String fileNameInJarWithoutExtension 
                     = fileNameInJar.substring(0, fileNameInJar.lastIndexOf("."));
             
-            if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) {
-                fileNameInJarWithoutExtension += "64";
-            }
+//            if (platform.is64Bit() && !fileNameInJarWithoutExtension.endsWith("64")) {
+//                fileNameInJarWithoutExtension += "64";
+//            }
             
             String systemJniExtension;
             String dummyLib = mapLibraryName_emulated("", platform);
@@ -510,11 +510,11 @@ 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";
-            }
+//            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("");