Oh, mac universal builds seem to work after all? yay!

inkle · May 15, 2024 · 80d6a01 · 80d6a01
1 parent e82e82e
commit 80d6a01
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 node_modules
 *.sublime-workspace
 Inky-darwin-x64
+Inky-darwin-arm64
+Inky-darwin-universal
 Inky-win32-x64
 Inky-win32-ia32
 Inky-linux-x64

diff --git a/BUILD_FOR_MAC.command b/BUILD_FOR_MAC.command
@@ -3,6 +3,7 @@ cd "`dirname "$0"`"
 # Clean
 rm -rf Inky-darwin-x64/
 rm -rf Inky-darwin-arm64/
+rm -rf Inky-darwin-universal/
 rm ReleaseUpload/Inky_mac.dmg
 
 # Ensure it's correctly/fully installed first
@@ -12,7 +13,7 @@ rm ReleaseUpload/Inky_mac.dmg
 ./resources/makeIcns.command
 
 # Mac
-npm exec -- @electron/packager app Inky --platform=darwin --arch=x64 --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
+npm exec -- @electron/packager app Inky --platform=darwin --arch=universal --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
 
 # Create a DMG
 # Requires appdmg: npm install -g appdmg

diff --git a/BUILD_PACKAGE.command b/BUILD_PACKAGE.command
@@ -3,6 +3,7 @@ cd "`dirname "$0"`"
 # Clean
 rm -rf Inky-darwin-x64/
 rm -rf Inky-darwin-arm64/
+rm -rf Inky-darwin-universal/
 rm -rf Inky-win32-x64/
 rm -rf Inky-win32-ia32/
 rm -rf Inky-linux-x64/
@@ -15,7 +16,7 @@ rm -rf ReleaseUpload
 ( cd app && npm install )
 
 # Mac
-npm exec -- @electron/packager app Inky --platform=darwin --arch=x64 --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
+npm exec -- @electron/packager app Inky --platform=darwin --arch=universal --overwrite --icon=resources/Icon.icns --extend-info=resources/info.plist --app-bundle-id=com.inkle.inky --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_win.exe"
 
 # Windows 64 bit (requires Wine - `brew install wine`)
 npm exec -- @electron/packager app Inky --platform=win32  --arch=x64 --icon=resources/Icon1024.png.ico --prune --asar.unpackDir="main-process/ink" --ignore="inklecate_mac" --win32metadata.ProductName="Inky" --win32metadata.CompanyName="inkle Ltd" --win32metadata.FileDescription="Inky" --win32metadata.OriginalFilename="Inky" --win32metadata.InternalName="Inky"

diff --git a/resources/appdmg.json b/resources/appdmg.json
@@ -4,7 +4,7 @@
   "background": "appdmg-background.png",
   "icon-size": 95,
   "contents": [
-    { "x": 107, "y": 92, "type": "file", "path": "../Inky-darwin-x64/Inky.app" },
+    { "x": 107, "y": 92, "type": "file", "path": "../Inky-darwin-universal/Inky.app" },
     { "x": 345, "y": 92, "type": "link", "path": "/Applications" }
   ]
 }