mac Support and more

README.md

@@ -5,11 +5,11 @@ An all and one modding suite for Mario Party that allows certian customizations
 ## Downloads
 
 ##### Stable Release
-  - [Windows (static)](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-win32.zip)
+  - [Windows (static)](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-win32-static.zip)
   - [Windows (dynamic)](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-win32-dynamic.zip)
-  - [macOS](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-darwin.zip)
+  - [macOS](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-darwin.zip) (universal)
 
 ##### Development Release
-  - [Windows (static)](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/windows/master/MarioPartyToolkit-win32.zip)
-  - [Windows (dynamic)](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/windows/master/MarioPartyToolkit-win32-dynamic.zip)
-  - [macOS](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/windows/master/MarioPartyToolkit-macOS.zip)
+  - [Windows (static)](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/ci/master/MarioPartyToolkit-win32-static.zip)
+  - [Windows (dynamic)](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/ci/master/MarioPartyToolkit-win32-dynamic.zip)
+  - [macOS](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/ci/master/MarioPartyToolkit-darwin.zip) (Intel, Gatekeeper block needed)

build-macos.sh

@@ -0,0 +1 @@
+pyinstaller --onefile main.py --add-data "assets/*:assets/" --name="Mario Party Toolkit" --noconsole  --icon="assets/diceBlock.ico" --distpath="dist/arm64" --target-arch universal2

build.bat

@@ -1 +1 @@
-pyinstaller --onefile .\main.py --add-data "assets/*;assets/" --name="MarioPartyToolkit" --noconsole --icon="assets/diceBlock.ico"
+pyinstaller --onefile .\main.py --add-data "assets/*;assets/" --name="Mario Party Toolkit" --noconsole --icon="assets/diceBlock.ico"

build.sh

@@ -1 +1,7 @@
-pyinstaller --onefile main.py --add-data "assets/*:assets/" --name="MarioPartyToolkit" --noconsole  --icon="assets/diceBlock.ico"
+arch -arm64 /opt/homebrew/bin/pyinstaller --onefile main.py --add-data "assets/*:assets/" --name="Mario Party Toolkit" --noconsole  --icon="assets/diceBlock.ico" --distpath="dist/arm64"
+arch -x86_64 /usr/local/bin/pyinstaller --onefile main.py --add-data "assets/*:assets/" --name="Mario Party Toolkit" --noconsole  --icon="assets/diceBlock.ico" --distpath="dist/x86_64"
+rm "dist/arm64/Mario Party Toolkit"
+rm "dist/x86_64/Mario Party Toolkit"
+cp -r "dist/arm64/" "dist/universal2"
+rm "dist/universal2/Mario Party Toolkit.app/Contents/MacOS/Mario Party Toolkit"
+arch -arm64 lipo -create -output "dist/universal2/Mario Party Toolkit.app/Contents/MacOS/Mario Party Toolkit" "dist/x86_64/Mario Party Toolkit.app/Contents/MacOS/Mario Party Toolkit" "dist/arm64/Mario Party Toolkit.app/Contents/MacOS/Mario Party Toolkit"

install_macos_deps.sh

@@ -0,0 +1,5 @@
+arch -arm64 brew install [email protected] [email protected]
+arch -x86_64 brew install [email protected] [email protected]
+
+arch -arm64 /opt/homebrew/Cellar/[email protected]/3.12.1/bin/pip3.12 install -r requirements.txt --break-system-packages
+arch -x86_64 /usr/local/Cellar/[email protected]/3.12.1/bin/pip3.12 install -r requirements.txt --break-system-packages

install_pip_deps.bat

@@ -1 +1 @@
-python -m pip install -r requirements
+python -m pip install -r requirements.txt

requirements.txt

@@ -2,4 +2,4 @@ customtkinter
 tk
 Pillow
 pyperclip
-pyinstaller
+pyinstaller