diff --git a/imgui-lwjgl3/build.gradle b/imgui-lwjgl3/build.gradle index ba683e6..00e419d 100644 --- a/imgui-lwjgl3/build.gradle +++ b/imgui-lwjgl3/build.gradle @@ -1,3 +1,5 @@ +import org.gradle.internal.os.OperatingSystem + plugins { id 'java' id 'checkstyle' @@ -7,6 +9,15 @@ plugins { sourceCompatibility = 1.8 +switch (OperatingSystem.current()) { + case OperatingSystem.LINUX: + project.ext.lwjglNatives = 'natives-linux' + break + case OperatingSystem.WINDOWS: + project.ext.lwjglNatives = 'natives-windows' + break +} + dependencies { implementation platform("org.lwjgl:lwjgl-bom:3.2.3") @@ -14,13 +25,17 @@ dependencies { implementation 'org.lwjgl:lwjgl-glfw' implementation 'org.lwjgl:lwjgl-opengl' + testRuntimeOnly "org.lwjgl:lwjgl::$lwjglNatives" + testRuntimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives" + testRuntimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives" + implementation project(':imgui-binding') } task startExample(type: JavaExec, dependsOn: build) { main = 'ImGuiGlfwExample' classpath = sourceSets.test.runtimeClasspath - jvmArgs = ['-Djava.library.path=../bin', '-Dorg.lwjgl.librarypath=./lwjgl-libs'] + jvmArgs = ['-Djava.library.path=../bin'] } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/imgui-lwjgl3/lwjgl-libs/glfw.dll b/imgui-lwjgl3/lwjgl-libs/glfw.dll deleted file mode 100644 index 0fbec1f..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/glfw.dll and /dev/null differ diff --git a/imgui-lwjgl3/lwjgl-libs/libglfw.so b/imgui-lwjgl3/lwjgl-libs/libglfw.so deleted file mode 100644 index 68d8857..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/libglfw.so and /dev/null differ diff --git a/imgui-lwjgl3/lwjgl-libs/liblwjgl.so b/imgui-lwjgl3/lwjgl-libs/liblwjgl.so deleted file mode 100644 index 8f71a1e..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/liblwjgl.so and /dev/null differ diff --git a/imgui-lwjgl3/lwjgl-libs/liblwjgl_opengl.so b/imgui-lwjgl3/lwjgl-libs/liblwjgl_opengl.so deleted file mode 100644 index 1ef37a9..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/liblwjgl_opengl.so and /dev/null differ diff --git a/imgui-lwjgl3/lwjgl-libs/lwjgl.dll b/imgui-lwjgl3/lwjgl-libs/lwjgl.dll deleted file mode 100644 index 055b4df..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/lwjgl.dll and /dev/null differ diff --git a/imgui-lwjgl3/lwjgl-libs/lwjgl_opengl.dll b/imgui-lwjgl3/lwjgl-libs/lwjgl_opengl.dll deleted file mode 100644 index ab29f88..0000000 Binary files a/imgui-lwjgl3/lwjgl-libs/lwjgl_opengl.dll and /dev/null differ