diff --git a/.gitignore b/.gitignore index 693d85d..43438c5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ thumbs.db *_linux *.dmg *.tar.gz -*.zip \ No newline at end of file +*.zip +*.app \ No newline at end of file diff --git a/Makefile b/Makefile index aae788b..e0fede4 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ macos: macos_release: # Remove data rm -rdf data/config - rm -rdf "$(releaseFolder) + rm -rdf "$(releaseFolder)" # Create folders mkdir -p data/config @@ -65,19 +65,27 @@ macos_release: cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources" cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents" -# Build +# Build INTEL clang++ $(source) -D RELEASE -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12 -# Remove folders - rm -rdf Frameworks - -# Build DMG +# Build INTEL DMG + rm -f "$(executable)_macos_intel_$(version).dmg" hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" - hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_$(version).dmg" + hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_intel_$(version).dmg" + rm tmp.dmg + +# Build APPLE SILICON + clang++ $(source) -D RELEASE -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11 + +# Build APPLE SILICON DMG + rm -f "$(executable)_macos_apple_silicon_$(version).dmg" + hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" + hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_apple_silicon_$(version).dmg" + rm tmp.dmg # Remove data + rm -rdf Frameworks rm -rdf "$(releaseFolder)" - rm tmp.dmg linux: rm -rdf data/config