diff --git a/build.gradle b/build.gradle index 718c2067..ab102923 100644 --- 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 new file mode 100644 index 00000000..d990b342 Binary files /dev/null and b/lib/jinput-2.0.9-natives-all.jar differ diff --git a/lib/linux/libjinput-linux.so b/lib/linux/libjinput-linux.so new file mode 100644 index 00000000..dba9e59f Binary files /dev/null and b/lib/linux/libjinput-linux.so differ diff --git a/lib/linux/libjinput-linux64.so b/lib/linux/libjinput-linux64.so new file mode 100644 index 00000000..0512c928 Binary files /dev/null and b/lib/linux/libjinput-linux64.so differ diff --git a/lib/osx/libjinput-osx.jnilib b/lib/osx/libjinput-osx.jnilib new file mode 100644 index 00000000..4d90199f Binary files /dev/null and b/lib/osx/libjinput-osx.jnilib differ diff --git a/lib/windows/jinput-dx8_64.dll b/lib/windows/jinput-dx8_64.dll new file mode 100644 index 00000000..732718c0 Binary files /dev/null and b/lib/windows/jinput-dx8_64.dll differ diff --git a/lib/windows/jinput-raw_64.dll b/lib/windows/jinput-raw_64.dll new file mode 100644 index 00000000..644d1061 Binary files /dev/null and b/lib/windows/jinput-raw_64.dll differ diff --git a/lib/windows/jinput-wintab.dll b/lib/windows/jinput-wintab.dll new file mode 100644 index 00000000..3ac18eb2 Binary files /dev/null and b/lib/windows/jinput-wintab.dll differ diff --git a/src/test/java/omegadrive/input/GamepadTest.java b/src/test/java/omegadrive/input/GamepadTest.java index 4ac2bb2a..d3457dac 100644 --- 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");