mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 15:27:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added documentation for Mac parameters as per #5679 and future-proofing build.gradle for eventual mac releases

Browse Source
This commit is contained in:
yairm210
2021-11-27 21:05:11 +02:00
parent 84e600786c
commit 05742e02f3
3 changed files with 137 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/build.gradle.kts
View File

@ -21,9 +21,11 @@ val assetsDir = file("../android/assets")
val discordDir = file("discord_rpc")
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") {
jvmArgs = listOf("-XstartOnFirstThread") // See https://github.com/libgdx/libgdx/wiki/Starter-classes-and-configuration#common-issues
jvmArgs = jvmArgsForMac
dependsOn(tasks.getByName("classes"))
@ -35,6 +37,7 @@ tasks.register<JavaExec>("run") {
}
tasks.register<JavaExec>("debug") {
jvmArgs = jvmArgsForMac
dependsOn(tasks.getByName("classes"))
main = mainClassName
classpath = sourceSets.main.get().runtimeClasspath
@ -132,7 +135,11 @@ for (platform in PackrConfig.Platform.values()) {
" --executable Unciv" +
" --classpath $jarFile" +
" --mainclass $mainClassName" +
" --vmargs Xmx1G " + (if (platform == PackrConfig.Platform.MacOS) "XstartOnFirstThread" else "") +
" --vmargs Xmx1G " +
(if (platform == PackrConfig.Platform.MacOS) jvmArgsForMac.joinToString(" ") {
it.removePrefix("-")
}
else "") +
" --output ${config.outDir}"
command.runCommand(rootDir)
}