diff --git a/buildapp/AppIcon.icns b/buildapp/AppIcon.icns new file mode 100644 index 000000000..8a7416da3 Binary files /dev/null and b/buildapp/AppIcon.icns differ 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 @@ CFBundleExecutableTerrarum.sh CFBundleDisplayNameTerrarum CFBundleNameTerrarum +CFBundleIconFileAppIcon.icns 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 @@ CFBundleExecutableTerrarum.sh CFBundleDisplayNameTerrarum CFBundleNameTerrarum +CFBundleIconFileAppIcon.icns