Skip to content

Commit ff30d12

Browse files
committed
LibGDX 1.13.1
1 parent 612375d commit ff30d12

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

buildSrc/src/main/kotlin/BuildConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object BuildConfig {
77
const val appCodeNumber = 1089
88
const val appVersion = "4.15.1"
99

10-
const val gdxVersion = "1.12.1"
10+
const val gdxVersion = "1.13.1"
1111
const val ktorVersion = "2.3.12"
1212
const val coroutinesVersion = "1.8.1"
1313

desktop/build.gradle.kts

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
import com.unciv.build.BuildConfig
3-
import com.unciv.build.BuildConfig.gdxVersion
43

54
plugins {
65
id("kotlin")
@@ -23,11 +22,6 @@ java {
2322
targetCompatibility = JavaVersion.VERSION_1_8
2423
}
2524

26-
dependencies {
27-
// See https://libgdx.com/news/2021/07/devlog-7-lwjgl3#do-i-need-to-do-anything-else
28-
api("com.badlogicgames.gdx:gdx-lwjgl3-glfw-awt-macos:$gdxVersion")
29-
}
30-
3125
val mainClassName = "com.unciv.app.desktop.DesktopLauncher"
3226
val assetsDir = file("../android/assets")
3327
val discordDir = file("discord_rpc")

desktop/src/com/unciv/app/desktop/DesktopLauncher.kt

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.unciv.app.desktop
33
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
44
import com.badlogic.gdx.files.FileHandle
55
import com.badlogic.gdx.graphics.glutils.HdpiMode
6+
import com.badlogic.gdx.utils.SharedLibraryLoader
67
import com.unciv.app.desktop.DesktopScreenMode.Companion.getMaximumWindowBounds
78
import com.unciv.json.json
89
import com.unciv.logic.files.SETTINGS_FILE_NAME
@@ -18,13 +19,17 @@ import com.unciv.ui.components.fonts.Fonts
1819
import com.unciv.ui.screens.basescreen.BaseScreen
1920
import com.unciv.utils.Display
2021
import com.unciv.utils.Log
22+
import org.lwjgl.system.Configuration
2123
import java.io.File
2224
import kotlin.system.exitProcess
2325

2426
internal object DesktopLauncher {
2527

2628
@JvmStatic
2729
fun main(arg: Array<String>) {
30+
if (SharedLibraryLoader.isMac) {
31+
Configuration.GLFW_LIBRARY_NAME.set("glfw_async")
32+
}
2833

2934
// The uniques checker requires the file system to be seet up, which happens after lwjgw initializes it
3035
if (arg.isNotEmpty() && arg[0] == "mod-ci") {

0 commit comments

Comments
 (0)