diff --git a/.github/workflows/ReleaseBuilds.yml b/.github/workflows/ReleaseBuilds.yml index d146b12..47e7ce1 100644 --- a/.github/workflows/ReleaseBuilds.yml +++ b/.github/workflows/ReleaseBuilds.yml @@ -11,9 +11,9 @@ jobs: with: ref: master - - run: bash build.sh + - run: bash build-mac-app.sh - uses: actions/upload-artifact@v3 with: name: mac-build - path: packaging/*.dmg + path: *.dmg diff --git a/packaging/Info.plist b/Platform/macOS/Info.plist similarity index 100% rename from packaging/Info.plist rename to Platform/macOS/Info.plist diff --git a/packaging/SpaceCadetPinball.icns b/Platform/macOS/SpaceCadetPinball.icns similarity index 100% rename from packaging/SpaceCadetPinball.icns rename to Platform/macOS/SpaceCadetPinball.icns diff --git a/build.sh b/build-mac-app.sh similarity index 80% rename from build.sh rename to build-mac-app.sh index 2494b56..a77a492 100644 --- a/build.sh +++ b/build-mac-app.sh @@ -39,19 +39,17 @@ cd .. cmake . cmake --build . -cd packaging - sw_version='2.0.1' mkdir -p SpaceCadetPinball.app/Contents/MacOS mkdir -p SpaceCadetPinball.app/Contents/Resources mkdir -p SpaceCadetPinball.app/Contents/Frameworks -cp -a Info.plist SpaceCadetPinball.app/Contents/ -cp -a SpaceCadetPinball.icns SpaceCadetPinball.app/Contents/Resources/ -cp -a ../extern/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/ -cp -a ../extern/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/ -cp -a ../bin/SpaceCadetPinball SpaceCadetPinball.app/Contents/MacOS/ +cp -a Platform/macOS/Info.plist SpaceCadetPinball.app/Contents/ +cp -a Platform/macOS/SpaceCadetPinball.icns SpaceCadetPinball.app/Contents/Resources/ +cp -a extern/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/ +cp -a extern/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/ +cp -a bin/SpaceCadetPinball SpaceCadetPinball.app/Contents/MacOS/ sed -i '' "s/CHANGEME_SW_VERSION/$sw_version/" SpaceCadetPinball.app/Contents/Info.plist