LibGDX 1.13.1

yairm210 · Jan 8, 2025 · ff30d12 · ff30d12
1 parent 612375d
commit ff30d12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -7,7 +7,7 @@ object BuildConfig {
     const val appCodeNumber = 1089
     const val appVersion = "4.15.1"
 
-    const val gdxVersion = "1.12.1"
+    const val gdxVersion = "1.13.1"
     const val ktorVersion = "2.3.12"
     const val coroutinesVersion = "1.8.1"
 

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -1,6 +1,5 @@
 
 import com.unciv.build.BuildConfig
-import com.unciv.build.BuildConfig.gdxVersion
 
 plugins {
     id("kotlin")
@@ -23,11 +22,6 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-dependencies {
-    // See https://libgdx.com/news/2021/07/devlog-7-lwjgl3#do-i-need-to-do-anything-else
-    api("com.badlogicgames.gdx:gdx-lwjgl3-glfw-awt-macos:$gdxVersion")
-}
-
 val mainClassName = "com.unciv.app.desktop.DesktopLauncher"
 val assetsDir = file("../android/assets")
 val discordDir = file("discord_rpc")

diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -3,6 +3,7 @@ package com.unciv.app.desktop
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.files.FileHandle
 import com.badlogic.gdx.graphics.glutils.HdpiMode
+import com.badlogic.gdx.utils.SharedLibraryLoader
 import com.unciv.app.desktop.DesktopScreenMode.Companion.getMaximumWindowBounds
 import com.unciv.json.json
 import com.unciv.logic.files.SETTINGS_FILE_NAME
@@ -18,13 +19,17 @@ import com.unciv.ui.components.fonts.Fonts
 import com.unciv.ui.screens.basescreen.BaseScreen
 import com.unciv.utils.Display
 import com.unciv.utils.Log
+import org.lwjgl.system.Configuration
 import java.io.File
 import kotlin.system.exitProcess
 
 internal object DesktopLauncher {
 
     @JvmStatic
     fun main(arg: Array<String>) {
+        if (SharedLibraryLoader.isMac) {
+            Configuration.GLFW_LIBRARY_NAME.set("glfw_async")
+        }
 
         // The uniques checker requires the file system to be seet up, which happens after lwjgw initializes it
         if (arg.isNotEmpty() && arg[0] == "mod-ci") {