diff --git a/CMakeLists.txt b/CMakeLists.txt index 04945da..e08c8e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,19 +11,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Os -ffunction-sections -fdata-sec # Buscar SDL3 automáticamente find_package(SDL3 REQUIRED) -# Si no se encuentra SDL3, generar un error -if (NOT SDL3_FOUND) - message(FATAL_ERROR "SDL3 no encontrado. Por favor, verifica su instalación.") -endif() - # Buscar SDL3_ttf find_package(SDL3_ttf REQUIRED) -# Si no se encuentra SDL3_ttf, generar un error -if (NOT SDL3_ttf_FOUND) - message(FATAL_ERROR "SDL3_ttf no encontrado. Por favor, verifica su instalación.") -endif() - # ---- Shader compilation (non-Apple only: Vulkan/SPIRV) ---- if(NOT APPLE) find_program(GLSLC glslc HINTS "$ENV{VULKAN_SDK}/bin" "$ENV{VULKAN_SDK}/Bin") @@ -78,13 +68,10 @@ endif() # Detectar la plataforma y configuraciones específicas if(WIN32) - set(PLATFORM windows) set(LINK_LIBS SDL3::SDL3 SDL3_ttf::SDL3_ttf mingw32 ws2_32) elseif(UNIX AND NOT APPLE) - set(PLATFORM linux) set(LINK_LIBS SDL3::SDL3 SDL3_ttf::SDL3_ttf) elseif(APPLE) - set(PLATFORM macos) set(LINK_LIBS SDL3::SDL3 SDL3_ttf::SDL3_ttf) endif() diff --git a/Makefile b/Makefile index 4bece23..b5b6d29 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ DIR_ROOT := $(dir $(abspath $(MAKEFILE_LIST))) DIR_SOURCES := $(addsuffix /, $(DIR_ROOT)source) DIR_BIN := $(addsuffix /, $(DIR_ROOT)) -DIR_BUILD := $(addsuffix /, $(DIR_ROOT)build) DIR_TOOLS := $(addsuffix /, $(DIR_ROOT)tools) # Variables @@ -211,40 +210,6 @@ macos_release: force_resource_pack cp LICENSE "$(RELEASE_FOLDER)" cp README.md "$(RELEASE_FOLDER)" -# NOTA: create-dmg crea automáticamente el enlace a /Applications con --app-drop-link -# No es necesario crearlo manualmente aquí - -# Compila la versión para procesadores Intel -ifdef ENABLE_MACOS_X86_64 - $(CXX) $(APP_SOURCES) $(INCLUDES) -DMACOS_BUNDLE $(CXXFLAGS) $(LDFLAGS) -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos12 - -# 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)" - @if [ -f "$(MACOS_INTEL_RELEASE)" ]; then \ - echo "✓ Release Intel creado exitosamente: $(MACOS_INTEL_RELEASE)"; \ - else \ - echo "✗ Error: No se pudo crear el DMG Intel"; \ - exit 1; \ - fi - @rm -f rw.*.dmg 2>/dev/null || true -endif - # Compila la versión para procesadores Apple Silicon $(CXX) $(APP_SOURCES) $(INCLUDES) -DMACOS_BUNDLE -DSDL_DISABLE_IMMINTRIN_H $(CXXFLAGS) $(LDFLAGS) -o "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos12