diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index b650b59076..d8299a9ef1 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -1,4 +1,5 @@ +import com.google.common.io.Files import com.unciv.build.BuildConfig plugins { @@ -159,6 +160,7 @@ for (platform in Platform.values()) { " --vmargs Xmx1G " + " --output ${config.outDir}" command.runCommand(rootDir) + Files.copy(File("$rootDir/extraImages/Icons/Unciv.ico"), File(config.outDir, "Unciv.ico")) } tasks.register("zip${platformName}") { diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index 86d8a96180..96ad27524a 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -122,16 +122,16 @@ internal object DesktopLauncher { HardenGdxAudio(DesktopGame(config, customDataDir), config) exitProcess(0) } -} -private fun updateDockIconForMacOs(fileName: String) { - try { - val defaultToolkit: Toolkit = Toolkit.getDefaultToolkit() - val imageResource: URL = FileHandle(fileName).file().toURI().toURL() - val image: Image = defaultToolkit.getImage(imageResource) - val taskbar = Taskbar.getTaskbar() - taskbar.iconImage = image - } catch (throwable: Throwable) { - throwable.printStackTrace() + private fun updateDockIconForMacOs(fileName: String) { + try { + val defaultToolkit: Toolkit = Toolkit.getDefaultToolkit() + val imageResource: URL = FileHandle(fileName).file().toURI().toURL() + val image: Image = defaultToolkit.getImage(imageResource) + val taskbar = Taskbar.getTaskbar() + taskbar.iconImage = image + } catch (throwable: Throwable) { + throwable.printStackTrace() + } } -} \ No newline at end of file +}