AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 05:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

JvmArg not work for mac desktop:run. (#7681)

Browse Source 
* fix build bug.

* add package gdx-lwjgl3-glfw-awt-macos for mac only.

* use library with non-specify-platform.
This commit is contained in:
nacro711072 2022-08-29 04:24:54 +08:00 committed by GitHub
parent dd31276e5c
commit 3202239129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desktop/build.gradle.kts
View File

@ -1,6 +1,8 @@
import com.badlogicgames.packr.Packr import com.badlogicgames.packr.Packr
import com.badlogicgames.packr.PackrConfig import com.badlogicgames.packr.PackrConfig
import com.unciv.build.BuildConfig import com.unciv.build.BuildConfig
import com.unciv.build.BuildConfig.gdxVersion
import org.apache.tools.ant.taskdefs.condition.Os
plugins { plugins {
id("kotlin") id("kotlin")
@ -16,22 +18,18 @@ sourceSets {
} }
} }
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")
val deployFolder = file("../deploy") val deployFolder = file("../deploy")
// See https://github.com/libgdx/libgdx/wiki/Starter-classes-and-configuration#common-issues
// and https://github.com/yairm210/Unciv/issues/5679
val jvmArgsForMac = listOf("-XstartOnFirstThread", "-Djava.awt.headless=true")
tasks.register<JavaExec>("run") { tasks.register<JavaExec>("run") {
jvmArgs = mutableListOf<String>()
if ("mac" in System.getProperty("os.name").toLowerCase())
(jvmArgs as MutableList<String>).addAll(jvmArgsForMac)
// These are non-standard, only available/necessary on Mac.
dependsOn(tasks.getByName("classes")) dependsOn(tasks.getByName("classes"))
mainClass.set(mainClassName) mainClass.set(mainClassName)
classpath = sourceSets.main.get().runtimeClasspath classpath = sourceSets.main.get().runtimeClasspath
standardInput = System.`in` standardInput = System.`in`
@ -40,7 +38,6 @@ tasks.register<JavaExec>("run") {
} }
tasks.register<JavaExec>("debug") { tasks.register<JavaExec>("debug") {
jvmArgs = jvmArgsForMac
dependsOn(tasks.getByName("classes")) dependsOn(tasks.getByName("classes"))
mainClass.set(mainClassName) mainClass.set(mainClassName)
classpath = sourceSets.main.get().runtimeClasspath classpath = sourceSets.main.get().runtimeClasspath
@ -143,10 +140,6 @@ for (platform in PackrConfig.Platform.values()) {
" --classpath $jarFile" + " --classpath $jarFile" +
" --mainclass $mainClassName" + " --mainclass $mainClassName" +
" --vmargs Xmx1G " + " --vmargs Xmx1G " +
(if (platform == PackrConfig.Platform.MacOS) jvmArgsForMac.joinToString(" ") {
it.removePrefix("-")
}
else "") +
" --output ${config.outDir}" " --output ${config.outDir}"
command.runCommand(rootDir) command.runCommand(rootDir)
} }