From 50134899f8c4280d3cbc2bc86ffff9fafda48c13 Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Tue, 27 Jan 2015 11:49:06 +0100 Subject: [PATCH] - remove adding for 64 ending for natives --- .../com/jme3/system/NativeLibraryLoader.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java b/jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java index fed6816a7..1c1bdaa9b 100644 --- a/jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java +++ b/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("");