prova: 1
Some checks failed
Release / build-linux (push) Failing after 6s
Release / build-windows (push) Failing after 3s
Release / create-release (push) Has been skipped

This commit is contained in:
2025-11-24 09:45:10 +01:00
parent 59e6af62ba
commit 210f8a941e
6 changed files with 115 additions and 210 deletions

View File

@@ -441,6 +441,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
# ==============================================================================