From 7bf4949e8343b088c2bdb618eca2b6d672c407eb Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Tue, 29 Dec 2015 00:11:31 -0500 Subject: [PATCH] Revert native loading changes --- .../java/com/jme3/system/lwjgl/LwjglContext.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java index 354910bbc..3f1139886 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java +++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java @@ -167,23 +167,17 @@ public abstract class LwjglContext implements JmeContext { if (JmeSystem.isLowPermissions()) { return; } - - String extractPath = NativeLibraryLoader.getExtractionFolder().getAbsolutePath(); - if ("LWJGL".equals(settings.getAudioRenderer())) { NativeLibraryLoader.loadNativeLibrary("openal", true); } if (settings.useJoysticks()) { - System.setProperty("net.java.games.input.librarypath", extractPath); - NativeLibraryLoader.loadNativeLibrary("jinput", true, false); - NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true, false); + NativeLibraryLoader.loadNativeLibrary("jinput", true); + NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true); } if (NativeLibraryLoader.isUsingNativeBullet()) { NativeLibraryLoader.loadNativeLibrary("bulletjme", true); } - - System.setProperty("org.lwjgl.librarypath", extractPath); - NativeLibraryLoader.loadNativeLibrary("lwjgl", true, false); + NativeLibraryLoader.loadNativeLibrary("lwjgl", true); } protected int getNumSamplesToUse() {