diff --git a/client/build.gradle b/client/build.gradle index 9bb2525..290f090 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -1,8 +1,11 @@ +import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + apply plugin: 'java' apply plugin: 'application' group = 'minecraft' version = '1.2.5' +OperatingSystem os = DefaultNativePlatform.currentOperatingSystem compileJava { sourceCompatibility = targetCompatibility = 1.8 @@ -19,7 +22,7 @@ run { workingDir.mkdir() } - systemProperty 'java.library.path', file("$projectDir/natives/windows") + systemProperty 'java.library.path', file("$buildDir/natives") } repositories { @@ -27,8 +30,39 @@ repositories { } dependencies { - compile name: 'jinput' - compile name: 'lwjgl' - compile name: 'lwjgl_util' + compile name: 'jinput' // предположительно это "jinput-1.0.jar" + compile name: 'org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0' + compile name: 'org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0' compile name: 'paulscode' + + if (os.isWindows()) { + compile name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows' + // вроде подходит и слава богу + compile name: 'net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows' + } else { + compile name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux' + // вроде подходит и слава богу + compile name: 'net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux' + } +} + +tasks.register('copyNatives').configure { + doLast { + def classifier + def suffix + if (os.isWindows()) { + classifier = 'natives-windows' + suffix = '-natives-windows' + } else { + classifier = 'natives-linux' + suffix = '-natives-linux' + } + + copy { + def resolvedArtifacts = configurations.compile.resolvedConfiguration.resolvedArtifacts + def matches = resolvedArtifacts.findAll {it.classifier == classifier || it.name.endsWith(suffix)} + from matches.collect { it.file }.collect { zipTree(it).matching { exclude 'META-INF/**' } } + into "$buildDir/natives" + } + } } diff --git a/client/natives/windows/OpenAL32.dll b/client/natives/windows/OpenAL32.dll deleted file mode 100644 index c9d7d8b..0000000 Binary files a/client/natives/windows/OpenAL32.dll and /dev/null differ diff --git a/client/natives/windows/OpenAL64.dll b/client/natives/windows/OpenAL64.dll deleted file mode 100644 index 1ad940c..0000000 Binary files a/client/natives/windows/OpenAL64.dll and /dev/null differ diff --git a/client/natives/windows/jinput-dx8.dll b/client/natives/windows/jinput-dx8.dll deleted file mode 100644 index 6d27ad5..0000000 Binary files a/client/natives/windows/jinput-dx8.dll and /dev/null differ diff --git a/client/natives/windows/jinput-dx8_64.dll b/client/natives/windows/jinput-dx8_64.dll deleted file mode 100644 index 6730589..0000000 Binary files a/client/natives/windows/jinput-dx8_64.dll and /dev/null differ diff --git a/client/natives/windows/jinput-raw.dll b/client/natives/windows/jinput-raw.dll deleted file mode 100644 index ce1d162..0000000 Binary files a/client/natives/windows/jinput-raw.dll and /dev/null differ diff --git a/client/natives/windows/jinput-raw_64.dll b/client/natives/windows/jinput-raw_64.dll deleted file mode 100644 index 3d2b3ad..0000000 Binary files a/client/natives/windows/jinput-raw_64.dll and /dev/null differ diff --git a/client/natives/windows/lwjgl.dll b/client/natives/windows/lwjgl.dll deleted file mode 100644 index f9b9bbb..0000000 Binary files a/client/natives/windows/lwjgl.dll and /dev/null differ diff --git a/client/natives/windows/lwjgl64.dll b/client/natives/windows/lwjgl64.dll deleted file mode 100644 index 999a88f..0000000 Binary files a/client/natives/windows/lwjgl64.dll and /dev/null differ diff --git a/libs/lwjgl.jar b/libs/lwjgl.jar deleted file mode 100644 index e8441cd..0000000 Binary files a/libs/lwjgl.jar and /dev/null differ diff --git a/libs/lwjgl_util.jar b/libs/lwjgl_util.jar deleted file mode 100644 index b194d68..0000000 Binary files a/libs/lwjgl_util.jar and /dev/null differ diff --git a/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar b/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar new file mode 100644 index 0000000..6423d54 Binary files /dev/null and b/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar differ diff --git a/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar b/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar new file mode 100644 index 0000000..c7adeea Binary files /dev/null and b/libs/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar differ diff --git a/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux.jar b/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux.jar new file mode 100644 index 0000000..e6f9892 Binary files /dev/null and b/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux.jar differ diff --git a/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows.jar b/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows.jar new file mode 100644 index 0000000..451cbb9 Binary files /dev/null and b/libs/org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows.jar differ diff --git a/libs/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar b/libs/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar new file mode 100644 index 0000000..4cb7cda Binary files /dev/null and b/libs/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar differ diff --git a/libs/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar b/libs/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar new file mode 100644 index 0000000..c055bff Binary files /dev/null and b/libs/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar differ