From f25cb96a91287fd5994f79521b6eaedde134c38f Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 19 Oct 2025 09:46:55 +0200 Subject: [PATCH] Correciones en Makefile --- Makefile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index e166ff1..58877a3 100644 --- a/Makefile +++ b/Makefile @@ -67,36 +67,44 @@ APP_SOURCES := $(filter-out source/main_old.cpp, $(APP_SOURCES)) INCLUDES := -Isource -Isource/external # Variables segĂșn el sistema operativo +CXXFLAGS_BASE := -std=c++20 -Wall +CXXFLAGS := $(CXXFLAGS_BASE) -Os -ffunction-sections -fdata-sections +CXXFLAGS_DEBUG := $(CXXFLAGS_BASE) -g -D_DEBUG +LDFLAGS := + ifeq ($(OS),Windows_NT) FixPath = $(subst /,\\,$1) - CXXFLAGS := -std=c++20 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -static-libgcc -Wl,-Bstatic -lpthread -Wl,-Bdynamic -Wl,-subsystem,windows -DWINDOWS_BUILD - CXXFLAGS_DEBUG := -std=c++20 -Wall -g -D_DEBUG -DWINDOWS_BUILD - LDFLAGS := -lmingw32 -lws2_32 -lSDL3 -lopengl32 - RM := del /Q + CXXFLAGS += -DWINDOWS_BUILD + CXXFLAGS_DEBUG += -DWINDOWS_BUILD + LDFLAGS += -Wl,--gc-sections -static-libstdc++ -static-libgcc \ + -Wl,-Bstatic -lpthread -Wl,-Bdynamic -Wl,-subsystem,windows \ + -lmingw32 -lws2_32 -lSDL3 -lSDL3_ttf + RMFILE := del /Q + RMDIR := rmdir /S /Q MKDIR := mkdir else FixPath = $1 - CXXFLAGS := -std=c++20 -Wall -Os -ffunction-sections -fdata-sections - CXXFLAGS_DEBUG := -std=c++20 -Wall -g -D_DEBUG - LDFLAGS := -lSDL3 -lSDL3_ttf + LDFLAGS += -lSDL3 -lSDL3_ttf RMFILE := rm -f - RMDIR := rm -rdf + RMDIR := rm -rf MKDIR := mkdir -p UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) - CXXFLAGS += -DLINUX_BUILD - LDFLAGS += -lGL + CXXFLAGS += -DLINUX_BUILD + CXXFLAGS_DEBUG += -DLINUX_BUILD endif ifeq ($(UNAME_S),Darwin) - CXXFLAGS += -Wno-deprecated -DMACOS_BUILD - CXXFLAGS_DEBUG += -Wno-deprecated -DMACOS_BUILD - LDFLAGS += -framework OpenGL - # Configurar arquitectura (por defecto arm64, como en CMake) - CXXFLAGS += -arch arm64 - CXXFLAGS_DEBUG += -arch arm64 + CXXFLAGS += -DMACOS_BUILD -arch arm64 + CXXFLAGS_DEBUG += -DMACOS_BUILD -arch arm64 + # Si quieres binarios universales: + # CXXFLAGS += -arch x86_64 + # CXXFLAGS_DEBUG += -arch x86_64 + # Y frameworks si hacen falta: + # LDFLAGS += -framework Cocoa -framework IOKit endif endif + # Reglas para herramienta de empaquetado y resources.pack $(PACK_TOOL): $(PACK_SOURCES) @echo "Compilando herramienta de empaquetado..."