From 7d1f207e3a2f07337237805cfa00e79d3d3bcb45 Mon Sep 17 00:00:00 2001 From: Nayla Hanegan Date: Fri, 29 Dec 2023 20:08:36 -0500 Subject: [PATCH] mac Support and more --- README.md | 10 +++++----- build-macos.sh | 1 + build.bat | 2 +- build.sh | 8 +++++++- install_macos_deps.sh | 5 +++++ install_pip_deps.bat | 2 +- requirements.txt | 2 +- 7 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 build-macos.sh create mode 100644 install_macos_deps.sh diff --git a/README.md b/README.md index 034275f..723c202 100644 --- a/README.md +++ b/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) diff --git a/build-macos.sh b/build-macos.sh new file mode 100644 index 0000000..dc4138b --- /dev/null +++ b/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 diff --git a/build.bat b/build.bat index c296803..de748c7 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -pyinstaller --onefile .\main.py --add-data "assets/*;assets/" --name="MarioPartyToolkit" --noconsole --icon="assets/diceBlock.ico" \ No newline at end of file +pyinstaller --onefile .\main.py --add-data "assets/*;assets/" --name="Mario Party Toolkit" --noconsole --icon="assets/diceBlock.ico" \ No newline at end of file diff --git a/build.sh b/build.sh index 76adf8e..f1f2fe7 100644 --- a/build.sh +++ b/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" diff --git a/install_macos_deps.sh b/install_macos_deps.sh new file mode 100644 index 0000000..f98d56d --- /dev/null +++ b/install_macos_deps.sh @@ -0,0 +1,5 @@ +arch -arm64 brew install python@3.12 python-tk@3.12 +arch -x86_64 brew install python@3.12 python-tk@3.12 + +arch -arm64 /opt/homebrew/Cellar/python@3.12/3.12.1/bin/pip3.12 install -r requirements.txt --break-system-packages +arch -x86_64 /usr/local/Cellar/python@3.11/3.12.1/bin/pip3.12 install -r requirements.txt --break-system-packages diff --git a/install_pip_deps.bat b/install_pip_deps.bat index daa79c7..5f4235b 100644 --- a/install_pip_deps.bat +++ b/install_pip_deps.bat @@ -1 +1 @@ -python -m pip install -r requirements \ No newline at end of file +python -m pip install -r requirements.txt \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index dc981dd..3424b3d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ customtkinter tk Pillow pyperclip -pyinstaller \ No newline at end of file +pyinstaller