helios: include jinput libs

fedex81 · Sep 28, 2021 · c6f1046 · c6f1046
1 parent fc2c85a
commit c6f1046
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,6 @@ dependencies {
     //include local jars
     compile fileTree(dir: 'lib', include: ['*.jar'])
     testCompile fileTree(dir: 'lib', include: ['*.jar'])
-    testCompile fileTree(dir: 'privateLib', include: ['*.jar'])
 }
 
 def getDate() {
@@ -110,15 +109,6 @@ task copyRes {
         from configurations.runtime
         into "$buildDir/packageDir/lib"
     }
-    copy {
-        from("privateLib") {
-            exclude "misc/**"
-            exclude "src/**"
-            exclude "jna*.jar"
-            exclude "jmx*.jar"
-        }
-        into "$buildDir/packageDir/lib"
-    }
     copy {
         from ("res")
             include "*.properties"

diff --git a/lib/jinput-2.0.9-natives-all.jar b/lib/jinput-2.0.9-natives-all.jar
diff --git a/lib/linux/libjinput-linux.so b/lib/linux/libjinput-linux.so
diff --git a/lib/linux/libjinput-linux64.so b/lib/linux/libjinput-linux64.so
diff --git a/lib/osx/libjinput-osx.jnilib b/lib/osx/libjinput-osx.jnilib
diff --git a/lib/windows/jinput-dx8_64.dll b/lib/windows/jinput-dx8_64.dll
diff --git a/lib/windows/jinput-raw_64.dll b/lib/windows/jinput-raw_64.dll
diff --git a/lib/windows/jinput-wintab.dll b/lib/windows/jinput-wintab.dll
diff --git a/src/test/java/omegadrive/input/GamepadTest.java b/src/test/java/omegadrive/input/GamepadTest.java
@@ -35,7 +35,7 @@ public class GamepadTest {
     public static float ON = 1.0f;
 
     public static void main(String[] args) {
-        String lib = new File(".").getAbsolutePath() + File.separator + "privateLib"
+        String lib = new File(".").getAbsolutePath() + File.separator + "lib"
                 + File.separator + "linux";
         System.out.println(lib);
         System.setProperty("log4j.configurationFile", "./res/log4j2-info.properties");