reestructuració de la carpeta release

LICENSE

@@ -1,6 +1,6 @@
 Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
 
-Copyright (c) 2022 JailDoctor's Dilemma
+Copyright (c) 2022 JailDoctor's Dilemma - JailDesigner
 
 This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
 

Makefile

@@ -12,9 +12,10 @@ DIR_TOOLS      := $(addsuffix /, $(DIR_ROOT)tools)
 TARGET_NAME    := jaildoctors_dilemma
 TARGET_FILE    := $(DIR_BIN)$(TARGET_NAME)
 APP_NAME       := JailDoctor's Dilemma
+DIST_DIR       := dist
 RELEASE_FOLDER := jdd_release
 RELEASE_FILE   := $(RELEASE_FOLDER)/$(TARGET_NAME)
-RESOURCE_FILE  := release/jdd.res
+RESOURCE_FILE  := release/windows/jdd.res
 
 # ==============================================================================
 # PACKING TOOL
@@ -52,10 +53,10 @@ endif
 # ==============================================================================
 # RELEASE NAMES
 # ==============================================================================
-WINDOWS_RELEASE             := $(TARGET_NAME)-$(VERSION)-win32-x64.zip
-MACOS_INTEL_RELEASE         := $(TARGET_NAME)-$(VERSION)-macos-intel.dmg
-MACOS_APPLE_SILICON_RELEASE := $(TARGET_NAME)-$(VERSION)-macos-apple-silicon.dmg
-LINUX_RELEASE               := $(TARGET_NAME)-$(VERSION)-linux.tar.gz
+WINDOWS_RELEASE             := $(DIST_DIR)/$(TARGET_NAME)-$(VERSION)-win32-x64.zip
+MACOS_INTEL_RELEASE         := $(DIST_DIR)/$(TARGET_NAME)-$(VERSION)-macos-intel.dmg
+MACOS_APPLE_SILICON_RELEASE := $(DIST_DIR)/$(TARGET_NAME)-$(VERSION)-macos-apple-silicon.dmg
+LINUX_RELEASE               := $(DIST_DIR)/$(TARGET_NAME)-$(VERSION)-linux.tar.gz
 
 # ==============================================================================
 # SOURCE FILES
@@ -179,7 +180,7 @@ windows:
 	@echo Generando version.h...
 	@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; (Get-Content source/version.h.in) -replace '@GIT_HASH@', $$GIT_HASH | Set-Content source/version.h"
 	@echo Compilando para Windows con nombre: "$(WIN_TARGET_FILE).exe"
-	windres release/jdd.rc -O coff -o $(RESOURCE_FILE)
+	windres release/windows/jdd.rc -O coff -o $(RESOURCE_FILE)
 	g++ $(ALL_SOURCES) $(RESOURCE_FILE) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) -o "$(WIN_TARGET_FILE).exe"
 	strip -s -R .comment -R .gnu.version "$(WIN_TARGET_FILE).exe" --strip-unneeded
 
@@ -211,14 +212,15 @@ windows_release:
 	powershell Copy-Item "LICENSE" -Destination "$(RELEASE_FOLDER)"
 	powershell Copy-Item "README.md" -Destination "$(RELEASE_FOLDER)"
 	powershell Copy-Item "gamecontrollerdb.txt" -Destination "$(RELEASE_FOLDER)"
-	powershell Copy-Item "release\*.dll" -Destination "$(RELEASE_FOLDER)"
+	powershell Copy-Item "release\windows\dll\*.dll" -Destination "$(RELEASE_FOLDER)"
 
 # Compila (con icono)
-	windres release/jdd.rc -O coff -o $(RESOURCE_FILE)
+	windres release/windows/jdd.rc -O coff -o $(RESOURCE_FILE)
 	g++ $(ALL_SOURCES) $(RESOURCE_FILE) $(INCLUDES) -DRELEASE_BUILD $(CXXFLAGS) $(LDFLAGS) -o "$(WIN_RELEASE_FILE).exe"
 	strip -s -R .comment -R .gnu.version "$(WIN_RELEASE_FILE).exe" --strip-unneeded
 
 # Crea el fichero .zip
+	powershell if (-not (Test-Path "$(DIST_DIR)")) {New-Item "$(DIST_DIR)" -ItemType Directory}
 	powershell if (Test-Path "$(WINDOWS_RELEASE)") {Remove-Item "$(WINDOWS_RELEASE)"}
 	powershell Compress-Archive -Path "$(RELEASE_FOLDER)"/* -DestinationPath "$(WINDOWS_RELEASE)"
 	@echo Release creado: $(WINDOWS_RELEASE)
@@ -258,8 +260,7 @@ macos_release:
 	$(RMDIR) "$(RELEASE_FOLDER)"
 	$(RMDIR) Frameworks
 	$(RMFILE) tmp.dmg
-	$(RMFILE) "$(MACOS_INTEL_RELEASE)"
-	$(RMFILE) "$(MACOS_APPLE_SILICON_RELEASE)"
+
 
 # Crea la carpeta temporal para hacer el trabajo y las carpetas obligatorias para crear una app de macOS
 	$(MKDIR) "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Frameworks"
@@ -270,10 +271,10 @@ macos_release:
 # Copia carpetas y ficheros
 	cp resources.pack "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
 	cp gamecontrollerdb.txt "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
-	cp -R release/frameworks/SDL3.xcframework/macos-arm64_x86_64/SDL3.framework "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Frameworks"
-	cp -R release/frameworks/SDL3.xcframework/macos-arm64_x86_64/SDL3.framework Frameworks
-	cp release/*.icns "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
-	cp release/Info.plist "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents"
+	cp -R release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64/SDL3.framework "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Frameworks"
+	cp -R release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64/SDL3.framework Frameworks
+	cp release/icons/*.icns "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Resources"
+	cp release/macos/Info.plist "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents"
 	cp LICENSE "$(RELEASE_FOLDER)"
 	cp README.md "$(RELEASE_FOLDER)"
 
@@ -290,6 +291,7 @@ macos_release:
 	codesign --deep --force --sign - --timestamp=none "$(RELEASE_FOLDER)/$(APP_NAME).app"
 
 # Empaqueta el .dmg de la versión Intel con create-dmg
+	$(MKDIR) "$(DIST_DIR)"
 	@echo "Creando DMG Intel con iconos de 96x96..."
 	create-dmg \
 	  --volname "$(APP_NAME)" \
@@ -364,6 +366,7 @@ linux_release:
 
 # Crea la carpeta temporal para realizar el lanzamiento
 	$(MKDIR) "$(RELEASE_FOLDER)"
+	$(MKDIR) "$(DIST_DIR)"
 
 # Copia ficheros
 	cp resources.pack "$(RELEASE_FOLDER)"