Table sort for Windows and commit modified libraries

ultraq · May 31, 2024 · 0d2066c · 0d2066c
1 parent e5506c9
commit 0d2066c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /.logs
 /bin
 /lib
-/libraries
 /mix
 /mods
 

diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ import org.gradle.internal.os.OperatingSystem
 
 def os = OperatingSystem.current()
 def targetPlatform = findProperty('targetPlatform') ?:
-	os == OperatingSystem.MAC_OS ? System.getProperty('os.arch').startsWith('aarch64') ? 'macos-arm64' : 'macos' : 'windows'
+	os == OperatingSystem.MAC_OS && System.getProperty('os.arch').startsWith('aarch64') ? 'macos-arm64' : 'windows'
 
 // Global configuration
 allprojects {

diff --git a/libraries/imgui-java-binding-with-tablesortspecs-1.86.11.jar b/libraries/imgui-java-binding-with-tablesortspecs-1.86.11.jar
diff --git a/libraries/imgui-java-natives-with-tablesortspecs-macos-arm64-1.86.11.jar b/libraries/imgui-java-natives-with-tablesortspecs-macos-arm64-1.86.11.jar
diff --git a/libraries/imgui-java-natives-with-tablesortspecs-windows-1.86.11.jar b/libraries/imgui-java-natives-with-tablesortspecs-windows-1.86.11.jar
diff --git a/redhorizon-engine/build.gradle b/redhorizon-engine/build.gradle
@@ -39,8 +39,7 @@ dependencies {
 	implementation 'org.lwjgl:lwjgl-opengl'
 
 	runtimeOnly files("../libraries/imgui-java-natives-with-tablesortspecs-macos-arm64-${imguiVersion}.jar")
-	// TODO: Windows build
-//	runtimeOnly "io.github.spair:imgui-java-natives-windows:${imguiVersion}"
+	runtimeOnly files("../libraries/imgui-java-natives-with-tablesortspecs-windows-${imguiVersion}.jar")
 	['natives-macos-arm64', 'natives-windows'].each { natives ->
 		runtimeOnly "org.lwjgl:lwjgl::${natives}"
 		runtimeOnly "org.lwjgl:lwjgl-glfw::${natives}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     /.logs
     /bin
     /lib
-    /libraries
     /mix
     /mods
@@ Expand Down @@