mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 21:24:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "LibGDX 1.13.0 (#12338)"

Browse Source 
This reverts commit add48125c7.
This commit is contained in:
yairm210 2024-10-31 07:07:30 +02:00
parent b88e9ef116
commit 0c6ae89be3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -7,7 +7,7 @@ object BuildConfig {
const val appCodeNumber = 1063 const val appCodeNumber = 1063
const val appVersion = "4.14.1" 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 ktorVersion = "2.3.12"
const val coroutinesVersion = "1.8.1" const val coroutinesVersion = "1.8.1"

6
desktop/build.gradle.kts
View File

@ -1,5 +1,6 @@
import com.unciv.build.BuildConfig import com.unciv.build.BuildConfig
import com.unciv.build.BuildConfig.gdxVersion
plugins { plugins {
id("kotlin") id("kotlin")
@ -24,6 +25,11 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8 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 mainClassName = "com.unciv.app.desktop.DesktopLauncher"
val assetsDir = file("../android/assets") val assetsDir = file("../android/assets")
val discordDir = file("discord_rpc") val discordDir = file("discord_rpc")

5
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -3,7 +3,6 @@ package com.unciv.app.desktop
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.graphics.glutils.HdpiMode import com.badlogic.gdx.graphics.glutils.HdpiMode
import com.badlogic.gdx.utils.SharedLibraryLoader
import com.unciv.app.desktop.DesktopScreenMode.Companion.getMaximumWindowBounds import com.unciv.app.desktop.DesktopScreenMode.Companion.getMaximumWindowBounds
import com.unciv.json.json import com.unciv.json.json
import com.unciv.logic.files.SETTINGS_FILE_NAME 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.ui.screens.basescreen.BaseScreen
import com.unciv.utils.Display import com.unciv.utils.Display
import com.unciv.utils.Log import com.unciv.utils.Log
import org.lwjgl.system.Configuration
import java.io.File import java.io.File
import kotlin.system.exitProcess import kotlin.system.exitProcess
@ -27,9 +25,6 @@ internal object DesktopLauncher {
@JvmStatic @JvmStatic
fun main(arg: Array<String>) { 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 // The uniques checker requires the file system to be seet up, which happens after lwjgw initializes it
if (arg.isNotEmpty() && arg[0] == "mod-ci") { if (arg.isNotEmpty() && arg[0] == "mod-ci") {