Revert native loading changes

experimental
Kirill Vainer 9 years ago
parent 2ca55c8b3a
commit 7bf4949e83
  1. 12
      jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java

@ -167,23 +167,17 @@ public abstract class LwjglContext implements JmeContext {
if (JmeSystem.isLowPermissions()) { if (JmeSystem.isLowPermissions()) {
return; return;
} }
String extractPath = NativeLibraryLoader.getExtractionFolder().getAbsolutePath();
if ("LWJGL".equals(settings.getAudioRenderer())) { if ("LWJGL".equals(settings.getAudioRenderer())) {
NativeLibraryLoader.loadNativeLibrary("openal", true); NativeLibraryLoader.loadNativeLibrary("openal", true);
} }
if (settings.useJoysticks()) { if (settings.useJoysticks()) {
System.setProperty("net.java.games.input.librarypath", extractPath); NativeLibraryLoader.loadNativeLibrary("jinput", true);
NativeLibraryLoader.loadNativeLibrary("jinput", true, false); NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true);
NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true, false);
} }
if (NativeLibraryLoader.isUsingNativeBullet()) { if (NativeLibraryLoader.isUsingNativeBullet()) {
NativeLibraryLoader.loadNativeLibrary("bulletjme", true); NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
} }
NativeLibraryLoader.loadNativeLibrary("lwjgl", true);
System.setProperty("org.lwjgl.librarypath", extractPath);
NativeLibraryLoader.loadNativeLibrary("lwjgl", true, false);
} }
protected int getNumSamplesToUse() { protected int getNumSamplesToUse() {

Loading…
Cancel
Save