diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 7688c14fcd..2bf6c77abb 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -7,7 +7,7 @@ object BuildConfig { const val appCodeNumber = 1063 const val appVersion = "4.14.1" - const val gdxVersion = "1.13.0" + const val gdxVersion = "1.12.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 index 96ca3b921f..e99cf3e7f4 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -1,5 +1,6 @@ import com.unciv.build.BuildConfig +import com.unciv.build.BuildConfig.gdxVersion plugins { id("kotlin") @@ -24,6 +25,11 @@ 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 index 4ac99408cc..a4c60a427a 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -3,7 +3,6 @@ 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 @@ -19,7 +18,6 @@ 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 @@ -27,9 +25,6 @@ internal object DesktopLauncher { @JvmStatic fun main(arg: Array) { - 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") {