From 8538a1047f664c1d87df3a072437aa818b07ba96 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 3 Apr 2026 21:48:04 +0200 Subject: [PATCH] corregit makefile per a macos --- CMakeLists.txt | 12 +++++++++++- Makefile | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1049835..d3ac589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,17 @@ if(WIN32) target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32 mingw32) elseif(APPLE) target_compile_definitions(${PROJECT_NAME} PRIVATE MACOS_BUILD) - set(CMAKE_OSX_ARCHITECTURES "arm64") + if(NOT CMAKE_OSX_ARCHITECTURES) + set(CMAKE_OSX_ARCHITECTURES "arm64") + endif() + if(MACOS_BUNDLE) + target_compile_definitions(${PROJECT_NAME} PRIVATE MACOS_BUNDLE) + target_link_options(${PROJECT_NAME} PRIVATE + -framework SDL3 + -F ${CMAKE_SOURCE_DIR}/release/macos/frameworks/SDL3.xcframework/macos-arm64_x86_64 + -rpath @executable_path/../Frameworks/ + ) + endif() elseif(UNIX AND NOT APPLE) target_compile_definitions(${PROJECT_NAME} PRIVATE LINUX_BUILD) endif() diff --git a/Makefile b/Makefile index 50fcee2..356a461 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ endif pack_tool: @$(MAKE) -C $(DIR_PACK_TOOL) -resources.pack: pack_tool +resources.pack: @$(MAKE) -C $(DIR_PACK_TOOL) pack # ============================================================================== @@ -160,7 +160,7 @@ macos_release: @which create-dmg > /dev/null || (echo "Instalando create-dmg..." && brew install create-dmg) # Compila la versión para procesadores Intel con cmake - @cmake -S . -B build/intel -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 + @cmake -S . -B build/intel -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DMACOS_BUNDLE=ON @cmake --build build/intel # Elimina datos de compilaciones anteriores @@ -209,7 +209,7 @@ macos_release: @echo "Release Intel creado: $(MACOS_INTEL_RELEASE)" # Compila la versión para procesadores Apple Silicon con cmake - @cmake -S . -B build/arm -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 + @cmake -S . -B build/arm -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DMACOS_BUNDLE=ON @cmake --build build/arm cp "$(TARGET_FILE)" "$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/MacOS/$(TARGET_NAME)"