From 0af29baeb039c96da5cb62d7547fd10394b3f926 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 25 Nov 2025 13:24:49 +0100 Subject: [PATCH] modificats els noms de release eliminat el build macos-x64 --- .gitea/workflows/release.yml | 4 +-- Makefile | 53 ++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index f67f8e9..8be2bed 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -47,7 +47,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: linux-build - path: ./*-linux.tar.gz + path: ./*-linux-x64.tar.gz # ============================================================================ # BUILD WINDOWS (Cross-Compile usando el nuevo target del Makefile) @@ -91,7 +91,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: windows-build - path: ./*-win32-x64.zip + path: ./*-windows-x64.zip # ============================================================================ # RELEASE diff --git a/Makefile b/Makefile index 7565281..24fd376 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,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 := $(TARGET_NAME)-$(VERSION)-windows-x64.zip +MACOS_INTEL_RELEASE := $(TARGET_NAME)-$(VERSION)-macos-x64.dmg +MACOS_APPLE_SILICON_RELEASE := $(TARGET_NAME)-$(VERSION)-macos-arm64.dmg +LINUX_RELEASE := $(TARGET_NAME)-$(VERSION)-linux-x64.tar.gz RPI_RELEASE := $(TARGET_NAME)-$(VERSION)-rpi-arm64.tar.gz # ============================================================================== @@ -291,28 +291,28 @@ macos_release: sed -i '' '/CFBundleShortVersionString<\/key>/{n;s|.*|'"$$RAW_VERSION"'|;}' "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"; \ sed -i '' '/CFBundleVersion<\/key>/{n;s|.*|'"$$RAW_VERSION"'|;}' "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist" -# Compila la versión para procesadores Intel - clang++ $(ALL_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DRELEASE_BUILD -std=$(CPP_STANDARD) -Wall -Os -framework SDL3 -F ./Frameworks -framework OpenGL -Wno-deprecated -ffunction-sections -fdata-sections -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos13.3 -mmacosx-version-min=13.3 -D_LIBCPP_DISABLE_AVAILABILITY - -# Firma la aplicación - codesign --deep --force --sign - --timestamp=none "$(RELEASE_FOLDER)/$(APP_NAME).app" - -# Empaqueta el .dmg de la versión Intel con create-dmg - @echo "Creando DMG Intel con iconos de 96x96..." - create-dmg \ - --volname "$(APP_NAME)" \ - --window-pos 200 120 \ - --window-size 720 300 \ - --icon-size 96 \ - --text-size 12 \ - --icon "$(APP_NAME).app" 278 102 \ - --icon "LICENSE" 441 102 \ - --icon "README.md" 604 102 \ - --app-drop-link 115 102 \ - --hide-extension "$(APP_NAME).app" \ - "$(MACOS_INTEL_RELEASE)" \ - "$(RELEASE_FOLDER)" || true - @echo "Release Intel creado: $(MACOS_INTEL_RELEASE)" +## Compila la versión para procesadores Intel +# clang++ $(ALL_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DRELEASE_BUILD -std=$(CPP_STANDARD) -Wall -Os -framework SDL3 -F ./Frameworks -framework OpenGL -Wno-deprecated -ffunction-sections -fdata-sections -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos13.3 -mmacosx-version-min=13.3 -D_LIBCPP_DISABLE_AVAILABILITY +# +## Firma la aplicación +# codesign --deep --force --sign - --timestamp=none "$(RELEASE_FOLDER)/$(APP_NAME).app" +# +## Empaqueta el .dmg de la versión Intel con create-dmg +# @echo "Creando DMG Intel con iconos de 96x96..." +# create-dmg \ +# --volname "$(APP_NAME)" \ +# --window-pos 200 120 \ +# --window-size 720 300 \ +# --icon-size 96 \ +# --text-size 12 \ +# --icon "$(APP_NAME).app" 278 102 \ +# --icon "LICENSE" 441 102 \ +# --icon "README.md" 604 102 \ +# --app-drop-link 115 102 \ +# --hide-extension "$(APP_NAME).app" \ +# "$(MACOS_INTEL_RELEASE)" \ +# "$(RELEASE_FOLDER)" || true +# @echo "Release Intel creado: $(MACOS_INTEL_RELEASE)" # Compila la versión para procesadores Apple Silicon clang++ $(ALL_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DRELEASE_BUILD -std=$(CPP_STANDARD) -Wall -Os -framework SDL3 -F ./Frameworks -framework OpenGL -Wno-deprecated -ffunction-sections -fdata-sections -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos13.3 -mmacosx-version-min=13.3 -D_LIBCPP_DISABLE_AVAILABILITY @@ -531,6 +531,7 @@ help: @echo " windows - Compilar para Windows" @echo " windows_debug - Compilar debug para Windows" @echo " windows_release - Crear release completo para Windows" + @echo " windows_cross - Crear release completo para Windows desde entorno Linux" @echo " linux - Compilar para Linux" @echo " linux_debug - Compilar debug para Linux" @echo " linux_release - Crear release completo para Linux"