Browse Source

* Specify library path for JInput as well as LWJGL in case the user's home directory is used for natives

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8545 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
sha..rd 14 years ago
parent
commit
d1e81fc8c9
1 changed files with 7 additions and 1 deletions
  1. 7 1
      engine/src/desktop/com/jme3/system/Natives.java

+ 7 - 1
engine/src/desktop/com/jme3/system/Natives.java

@@ -196,6 +196,7 @@ public class Natives {
         boolean needOAL = false;
         boolean needOAL = false;
         boolean needJInput = false;
         boolean needJInput = false;
         boolean needNativeBullet = isUsingNativeBullet();
         boolean needNativeBullet = isUsingNativeBullet();
+        
         if (renderer != null) {
         if (renderer != null) {
             if (renderer.startsWith("LWJGL")) {
             if (renderer.startsWith("LWJGL")) {
                 needLWJGL = true;
                 needLWJGL = true;
@@ -209,12 +210,17 @@ public class Natives {
         }
         }
         needJInput = settings.useJoysticks();
         needJInput = settings.useJoysticks();
 
 
+        String libraryPath = getExtractionDir().toString();
         if (needLWJGL) {
         if (needLWJGL) {
             logger.log(Level.INFO, "Extraction Directory: {0}", getExtractionDir().toString());
             logger.log(Level.INFO, "Extraction Directory: {0}", getExtractionDir().toString());
 
 
             // LWJGL supports this feature where
             // LWJGL supports this feature where
             // it can load libraries from this path.
             // it can load libraries from this path.
-            System.setProperty("org.lwjgl.librarypath", getExtractionDir().toString());
+            System.setProperty("org.lwjgl.librarypath", libraryPath);
+        }
+        if (needJInput) {
+            // AND Luckily enough JInput supports the same feature.
+            System.setProperty("net.java.games.input.librarypath", libraryPath);
         }
         }
 
 
         switch (platform) {
         switch (platform) {