From bc66956524b2527286343d62c2be0c52dd0907c5 Mon Sep 17 00:00:00 2001
From: Sergio Valor Martinez <jaildesigner@gmail.com>
Date: Mon, 14 Nov 2022 07:52:56 +0100
Subject: [PATCH] Actualizado Makefile

---
 Makefile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 97bf559..865a2cb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
 version = v1.0
 
+# Release names
+windowsRelease = $(executable)-$(version)-win32-x64.zip
+macosIntelRelease = $(executable)-$(version)-macos-intel.dmg
+macosAppleSiliconRelease = $(executable)-$(version)-macos-apple-silicon.dmg
+linuxRelease = $(executable)-$(version)-linux.tar.gz
+
 windows:
 	@echo off
 	powershell if (Test-Path data\config) {Remove-Item data\config -Recurse -Force}
@@ -37,8 +43,8 @@ windows_release:
 	strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded
 
 # Create ZIP
-	powershell if (Test-Path $(executable)_win_$(version).zip) {Remove-Item $(executable)-$(version)-win32-x64.zip}
-	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(executable)-$(version)-win32-x64.zip
+	powershell if (Test-Path $(executable)_win_$(version).zip) {Remove-Item $(windowsRelease)}
+	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease)
 
 # Remove folder
 	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
@@ -77,19 +83,19 @@ macos_release:
 	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
 
 # Build INTEL DMG
-	rm -f "$(executable)_macos_intel_$(version).dmg"
+	rm -f "$(macosIntelRelease)"
 	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
-	hdiutil convert tmp.dmg -format UDZO -o "$(executable)-$(version)-macos-intel.dmg"
-	rm tmp.dmg
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)"
+	rm -f 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"
+	rm -f "$(macosAppleSiliconRelease)"
 	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
-	hdiutil convert tmp.dmg -format UDZO -o "$(executable)-$(version)-macos-apple-silicon.dmg"
-	rm tmp.dmg
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)"
+	rm -f tmp.dmg
 
 # Remove data
 	rm -rdf Frameworks
@@ -124,7 +130,8 @@ linux_release:
 	strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded
 
 # Pack files
-	cd $(releaseFolder) &&	tar -czvf ../$(executable)-$(version)-linux.tar.gz *
+	rm -f $(linuxRelease)
+	cd $(releaseFolder) &&	tar -czvf ../$(linuxRelease) *
 
 # Remove data
 	rm -rdf $(releaseFolder)
\ No newline at end of file