From 167797a7b2752100d35a7c52bbea07d3270138bd Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 21 Mar 2026 19:05:16 +0100 Subject: [PATCH] corregit build de release de windows --- Makefile | 15 ++++++--------- release/windows/jdd.rc | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 90cb885..f5384ca 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ APP_SOURCES := \ source/core/rendering/gif.cpp \ source/core/rendering/pixel_reveal.cpp \ source/core/rendering/surface_dissolve_sprite.cpp \ - source/core/rendering/opengl/opengl_shader.cpp \ + source/core/rendering/sdl3gpu/sdl3gpu_shader.cpp \ source/core/resources/resource_list.cpp \ source/core/resources/resource_cache.cpp \ source/core/resources/resource_helper.cpp \ @@ -133,7 +133,7 @@ ifeq ($(OS),Windows_NT) -Wl,--gc-sections -static-libstdc++ -static-libgcc \ -Wl,-subsystem,windows -DWINDOWS_BUILD CXXFLAGS_DEBUG := -std=$(CPP_STANDARD) -Wall -g -D_DEBUG -DWINDOWS_BUILD - LDFLAGS := -lmingw32 -lws2_32 -lSDL3 -lopengl32 + LDFLAGS := -lmingw32 -lws2_32 -lSDL3 RM := del /Q MKDIR := mkdir else @@ -147,12 +147,10 @@ else UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) CXXFLAGS += -DLINUX_BUILD - LDFLAGS += -lGL endif ifeq ($(UNAME_S),Darwin) - CXXFLAGS += -Wno-deprecated -DMACOS_BUILD - CXXFLAGS_DEBUG += -Wno-deprecated -DMACOS_BUILD - LDFLAGS += -framework OpenGL + CXXFLAGS += -DMACOS_BUILD + CXXFLAGS_DEBUG += -DMACOS_BUILD # Configurar arquitectura (por defecto arm64) CXXFLAGS += -arch arm64 CXXFLAGS_DEBUG += -arch arm64 @@ -187,7 +185,6 @@ windows: strip -s -R .comment -R .gnu.version "$(WIN_TARGET_FILE).exe" --strip-unneeded windows_release: - @$(MAKE) pack_tool @$(MAKE) resources.pack @echo off @echo Creando release para Windows - Version: $(VERSION) @@ -271,7 +268,7 @@ macos_release: 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 release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64 -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-macos10.15 + clang++ $(ALL_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DRELEASE_BUILD -std=$(CPP_STANDARD) -Wall -Os -framework SDL3 -F release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64 -ffunction-sections -fdata-sections -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.15 # Firma la aplicación codesign --deep --force --sign - --timestamp=none "$(RELEASE_FOLDER)/$(APP_NAME).app" @@ -295,7 +292,7 @@ macos_release: @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 release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64 -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-macos11 + clang++ $(ALL_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DRELEASE_BUILD -std=$(CPP_STANDARD) -Wall -Os -framework SDL3 -F release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64 -ffunction-sections -fdata-sections -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11 # Firma la aplicación codesign --deep --force --sign - --timestamp=none "$(RELEASE_FOLDER)/$(APP_NAME).app" diff --git a/release/windows/jdd.rc b/release/windows/jdd.rc index 11e586d..9c3b6c2 100644 --- a/release/windows/jdd.rc +++ b/release/windows/jdd.rc @@ -1,2 +1,2 @@ // jdd.rc -IDI_ICON1 ICON "icon.ico" +IDI_ICON1 ICON "release/icons/icon.ico"