actualitzat release.yalm
🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> corregida la ubicació de project.h canvis en create-release de release.yml CORREGIT UN PUTO ESPAI EN RELEASE.YML sadjasbndk fiuwhfiusdh sgdwehgr eriojgtoie
This commit is contained in:
78
Makefile
78
Makefile
@@ -118,7 +118,7 @@ ALL_SOURCES := $(APP_SOURCES)
|
||||
# ==============================================================================
|
||||
# INCLUDES
|
||||
# ==============================================================================
|
||||
INCLUDES := -Isource
|
||||
INCLUDES := -Isource -Ibuild
|
||||
|
||||
# ==============================================================================
|
||||
# COMPILER FLAGS (OS-specific)
|
||||
@@ -196,7 +196,8 @@ windows_release:
|
||||
|
||||
# Generate project.h from project.h.in
|
||||
@echo "Generando project.h..."
|
||||
@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; $$RAW_VERSION = '$(VERSION)' -replace '^v', ''; $$COPYRIGHT = (Select-String -Path 'CMakeLists.txt' -Pattern 'set\(PROJECT_COPYRIGHT \"(.+?)\"').Matches.Groups[1].Value; (Get-Content source/project.h.in) -replace '@PROJECT_NAME@', '$(TARGET_NAME)' -replace '@PROJECT_LONG_NAME@', '$(LONG_NAME)' -replace '@PROJECT_VERSION@', $$RAW_VERSION -replace '@PROJECT_COPYRIGHT@', $$COPYRIGHT -replace '@GIT_HASH@', $$GIT_HASH | Set-Content source/project.h"
|
||||
@powershell if (-not (Test-Path "build")) {New-Item "build" -ItemType Directory}
|
||||
@powershell -Command "$$GIT_HASH = (git rev-parse --short=7 HEAD 2>$$null); if (-not $$GIT_HASH) { $$GIT_HASH = 'unknown' }; $$RAW_VERSION = '$(VERSION)' -replace '^v', ''; $$COPYRIGHT = (Select-String -Path 'CMakeLists.txt' -Pattern 'set\(PROJECT_COPYRIGHT \"(.+?)\"').Matches.Groups[1].Value; (Get-Content source/project.h.in) -replace '@PROJECT_NAME@', '$(TARGET_NAME)' -replace '@PROJECT_LONG_NAME@', '$(LONG_NAME)' -replace '@PROJECT_VERSION@', $$RAW_VERSION -replace '@PROJECT_COPYRIGHT@', $$COPYRIGHT -replace '@GIT_HASH@', $$GIT_HASH | Set-Content build/project.h"
|
||||
|
||||
# Crea carpeta temporal 'RELEASE_FOLDER'
|
||||
powershell if (Test-Path "$(RELEASE_FOLDER)") {Remove-Item "$(RELEASE_FOLDER)" -Recurse -Force}
|
||||
@@ -245,6 +246,7 @@ macos_release:
|
||||
|
||||
# Generate project.h from project.h.in
|
||||
@echo "Generando project.h..."
|
||||
@$(MKDIR) build
|
||||
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
|
||||
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
|
||||
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
|
||||
@@ -253,7 +255,7 @@ macos_release:
|
||||
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
|
||||
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
|
||||
-e "s/@GIT_HASH@/$$GIT_HASH/g" \
|
||||
source/project.h.in > source/project.h
|
||||
source/project.h.in > build/project.h
|
||||
|
||||
# Elimina datos de compilaciones anteriores
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
@@ -358,6 +360,7 @@ linux_release:
|
||||
|
||||
# Generate project.h from project.h.in
|
||||
@echo "Generando project.h..."
|
||||
@$(MKDIR) build
|
||||
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
|
||||
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
|
||||
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
|
||||
@@ -366,7 +369,7 @@ linux_release:
|
||||
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
|
||||
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
|
||||
-e "s/@GIT_HASH@/$$GIT_HASH/g" \
|
||||
source/project.h.in > source/project.h
|
||||
source/project.h.in > build/project.h
|
||||
|
||||
# Elimina carpetas previas
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
@@ -407,6 +410,7 @@ rpi_release:
|
||||
|
||||
# Generate project.h from project.h.in
|
||||
@echo "Generando project.h..."
|
||||
@$(MKDIR) build
|
||||
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
|
||||
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
|
||||
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
|
||||
@@ -415,7 +419,7 @@ rpi_release:
|
||||
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
|
||||
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
|
||||
-e "s/@GIT_HASH@/$$GIT_HASH/g" \
|
||||
source/project.h.in > source/project.h
|
||||
source/project.h.in > build/project.h
|
||||
|
||||
# Elimina carpetas previas
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
@@ -441,6 +445,70 @@ rpi_release:
|
||||
# Elimina la carpeta temporal
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
|
||||
# ==============================================================================
|
||||
# CROSS-COMPILATION (Linux -> Windows)
|
||||
# ==============================================================================
|
||||
CROSS_CXX := x86_64-w64-mingw32-g++
|
||||
CROSS_STRIP := x86_64-w64-mingw32-strip
|
||||
CROSS_WINDRES := x86_64-w64-mingw32-windres
|
||||
CROSS_ZIP_FILE := $(TARGET_NAME)-$(VERSION)-win32-x64.zip
|
||||
|
||||
CROSS_CXXFLAGS := -std=$(CPP_STANDARD) -Wall -Os -ffunction-sections -fdata-sections \
|
||||
-Wl,--gc-sections -static-libstdc++ -static-libgcc \
|
||||
-Wl,-subsystem,windows -DWINDOWS_BUILD -DRELEASE_BUILD
|
||||
CROSS_LDFLAGS := -lmingw32 -lws2_32 -lSDL3 -lopengl32
|
||||
|
||||
windows_cross:
|
||||
@$(MAKE) pack_tool
|
||||
@$(MAKE) resources.pack
|
||||
@echo "Cross-compiling para Windows desde Linux..."
|
||||
|
||||
# 1. Generar project.h
|
||||
@GIT_HASH=$$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown"); \
|
||||
RAW_VERSION=$$(echo "$(VERSION)" | sed 's/^v//'); \
|
||||
COPYRIGHT=$$(sed -n 's/.*set(PROJECT_COPYRIGHT "\([^"]*\)".*/\1/p' CMakeLists.txt); \
|
||||
sed -e "s/@PROJECT_NAME@/$(TARGET_NAME)/g" \
|
||||
-e "s/@PROJECT_LONG_NAME@/$(LONG_NAME)/g" \
|
||||
-e "s/@PROJECT_VERSION@/$$RAW_VERSION/g" \
|
||||
-e "s/@PROJECT_COPYRIGHT@/$$COPYRIGHT/g" \
|
||||
-e "s/@GIT_HASH@/$$GIT_HASH/g" \
|
||||
source/project.h.in > source/project.h
|
||||
|
||||
# 2. Preparar carpetas
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
$(MKDIR) "$(RELEASE_FOLDER)"
|
||||
|
||||
# 3. Copiar recursos base
|
||||
cp resources.pack "$(RELEASE_FOLDER)"
|
||||
cp LICENSE "$(RELEASE_FOLDER)"
|
||||
cp README.md "$(RELEASE_FOLDER)"
|
||||
cp gamecontrollerdb.txt "$(RELEASE_FOLDER)"
|
||||
|
||||
# 4. GESTIÓN DE DLLs (Aquí está la mejora)
|
||||
# [cite_start]Copia las DLLs locales si existen (como en tu windows_release) [cite: 16]
|
||||
@if [ -d "release/dll" ] && [ "$$(ls -A release/dll/*.dll 2>/dev/null)" ]; then \
|
||||
cp release/dll/*.dll "$(RELEASE_FOLDER)"; \
|
||||
echo "Copiadas DLLs locales desde release/dll/"; \
|
||||
fi
|
||||
# Copia la DLL de SDL3 externa si se pasa como argumento (Para el CI)
|
||||
@if [ -n "$(SDL_DLL_PATH)" ]; then \
|
||||
cp "$(SDL_DLL_PATH)" "$(RELEASE_FOLDER)"; \
|
||||
echo "Copiada SDL3 DLL desde $(SDL_DLL_PATH)"; \
|
||||
fi
|
||||
|
||||
# 5. Compilar
|
||||
@echo "Compilando recursos e icono..."
|
||||
$(CROSS_WINDRES) release/$(TARGET_NAME).rc -O coff -o $(RESOURCE_FILE)
|
||||
@echo "Compilando ejecutable..."
|
||||
$(CROSS_CXX) $(ALL_SOURCES) $(RESOURCE_FILE) $(INCLUDES) $(CROSS_CXXFLAGS) $(CROSS_LDFLAGS) -o "$(RELEASE_FOLDER)/$(APP_NAME).exe"
|
||||
$(CROSS_STRIP) -s "$(RELEASE_FOLDER)/$(APP_NAME).exe"
|
||||
|
||||
# 6. Empaquetar
|
||||
@echo "Empaquetando en $(CROSS_ZIP_FILE)..."
|
||||
cd $(RELEASE_FOLDER) && zip -r ../$(CROSS_ZIP_FILE) .
|
||||
$(RMDIR) "$(RELEASE_FOLDER)"
|
||||
@echo "✓ Release de Windows (Cross) completado: $(CROSS_ZIP_FILE)"
|
||||
|
||||
# ==============================================================================
|
||||
# SETUP
|
||||
# ==============================================================================
|
||||
|
||||
Reference in New Issue
Block a user