From 1b0f233fcbceb2f0701972d5dfbe0bd73800c7a3 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 15 May 2023 17:59:02 +0900
Subject: [PATCH] mac app building with icons

---
 buildapp/AppIcon.icns               | Bin 0 -> 7128 bytes
 buildapp/build_app_mac_arm.sh       |   3 ++-
 buildapp/build_app_mac_x86.sh       |   3 ++-
 buildapp/icns.png                   |   4 ++--
 buildapp/instructions.md            |   8 ++++++++
 buildapp/terrarummac_arm/Info.plist |   1 +
 buildapp/terrarummac_x86/Info.plist |   1 +
 7 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 buildapp/AppIcon.icns

diff --git a/buildapp/AppIcon.icns b/buildapp/AppIcon.icns
new file mode 100644
index 0000000000000000000000000000000000000000..8a7416da3e4fe390c85fc7af71c26f7dfea05533
GIT binary patch
literal 7128
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

literal 0
HcmV?d00001

diff --git a/buildapp/build_app_mac_arm.sh b/buildapp/build_app_mac_arm.sh
index 6c23790d3..5c2c55105 100755
--- a/buildapp/build_app_mac_arm.sh
+++ b/buildapp/build_app_mac_arm.sh
@@ -16,9 +16,10 @@ rm -rf $DESTDIR || true
 mkdir $DESTDIR
 mkdir $DESTDIR/Contents
 mkdir $DESTDIR/Contents/MacOS
+mkdir $DESTDIR/Contents/Resources
 
 # Prepare an application
-cp icns.png $DESTDIR/.icns
+cp AppIcon.icns $DESTDIR/Contents/Resources/AppIcon.icns
 cp $SRCFILES/Info.plist $DESTDIR/Contents/
 cp $SRCFILES/Terrarum.sh $DESTDIR/Contents/MacOS/
 chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh
diff --git a/buildapp/build_app_mac_x86.sh b/buildapp/build_app_mac_x86.sh
index a67904546..a170ace0c 100755
--- a/buildapp/build_app_mac_x86.sh
+++ b/buildapp/build_app_mac_x86.sh
@@ -16,9 +16,10 @@ rm -rf $DESTDIR || true
 mkdir $DESTDIR
 mkdir $DESTDIR/Contents
 mkdir $DESTDIR/Contents/MacOS
+mkdir $DESTDIR/Contents/Resources
 
 # Prepare an application
-cp icns.png $DESTDIR/.icns
+cp AppIcon.icns $DESTDIR/Contents/Resources/AppIcon.icns
 cp $SRCFILES/Info.plist $DESTDIR/Contents/
 cp $SRCFILES/Terrarum.sh $DESTDIR/Contents/MacOS/
 chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh
diff --git a/buildapp/icns.png b/buildapp/icns.png
index 7e14c22a0..3bdccbec2 100644
--- a/buildapp/icns.png
+++ b/buildapp/icns.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6daf9a7822ff9d7c8404b4ab1efb2dbfffa2e0f4a06761045855b45bf51562e4
-size 1176
+oid sha256:7e25e24a377037130448285aabae17f3c240755ad40da759d589ea24914f3592
+size 2972
diff --git a/buildapp/instructions.md b/buildapp/instructions.md
index 44a684365..77dbe4630 100644
--- a/buildapp/instructions.md
+++ b/buildapp/instructions.md
@@ -56,6 +56,14 @@ Terrarum.*.app
 
 Hide the `.jar` within the subdirectory; users will think this file is the main executable and will try to execute it using whatever JVM they may (or may not) have.
 
+### OSX .icns creation
+
+0. Do this on a real macOS
+1. Create a folder `icon.iconset`, then cp the .png file as `icon_512x512.png`
+2. On Terminal, `iconutil -c icns icon.iconset`
+
+https://gist.github.com/jamieweavis/b4c394607641e1280d447deed5fc85fc
+
 #### Some Notes
 
 - Windows EXE creation is not there yet. Maybe use one of [these?](https://sourceforge.net/projects/batch-compiler/)
diff --git a/buildapp/terrarummac_arm/Info.plist b/buildapp/terrarummac_arm/Info.plist
index 11cc7ad01..98007e222 100644
--- a/buildapp/terrarummac_arm/Info.plist
+++ b/buildapp/terrarummac_arm/Info.plist
@@ -4,4 +4,5 @@
 <key>CFBundleExecutable</key><string>Terrarum.sh</string>
 <key>CFBundleDisplayName</key><string>Terrarum</string>
 <key>CFBundleName</key><string>Terrarum</string>
+<key>CFBundleIconFile</key><string>AppIcon.icns</string>
 </dict></plist>
diff --git a/buildapp/terrarummac_x86/Info.plist b/buildapp/terrarummac_x86/Info.plist
index 11cc7ad01..98007e222 100644
--- a/buildapp/terrarummac_x86/Info.plist
+++ b/buildapp/terrarummac_x86/Info.plist
@@ -4,4 +4,5 @@
 <key>CFBundleExecutable</key><string>Terrarum.sh</string>
 <key>CFBundleDisplayName</key><string>Terrarum</string>
 <key>CFBundleName</key><string>Terrarum</string>
+<key>CFBundleIconFile</key><string>AppIcon.icns</string>
 </dict></plist>