diff --git a/Makefile b/Makefile index 67ee6bf..4a2150c 100644 --- a/Makefile +++ b/Makefile @@ -55,10 +55,13 @@ macos: clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos macos_release: -# Remove data +# Remove data and possible data rm -rdf data/config rm -rdf "$(releaseFolder)" rm -rdf Frameworks + rm -f tmp.dmg + rm -f "$(macosIntelRelease)" + rm -f "$(macosAppleSiliconRelease)" # Create folders mkdir -p data/config @@ -84,7 +87,6 @@ macos_release: clang++ $(source) -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 # Build INTEL DMG - rm -f "$(macosIntelRelease)" hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)" rm -f tmp.dmg @@ -93,7 +95,6 @@ macos_release: clang++ $(source) -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 "$(macosAppleSiliconRelease)" hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)" rm -f tmp.dmg