From fb023df1e1172e9fb4da47482d8474c1492217a1 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 12 Apr 2026 19:57:32 +0200 Subject: [PATCH] build wasm a build/wasm i output a dist/wasm Co-Authored-By: Claude Opus 4.6 (1M context) --- CMakeLists.txt | 7 +++++-- Makefile | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1430f3..d370278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,8 +49,11 @@ else() message(STATUS "SDL3 encontrado: ${SDL3_INCLUDE_DIRS}") endif() -# Configuración común de salida de ejecutables en el directorio raíz -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}) +# Configuración de salida de ejecutables +if(NOT EMSCRIPTEN) + # En desktop, el ejecutable va a la raíz del proyecto + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() # Añadir ejecutable principal add_executable(${PROJECT_NAME} ${SOURCES}) diff --git a/Makefile b/Makefile index 713b122..567e64c 100644 --- a/Makefile +++ b/Makefile @@ -245,8 +245,13 @@ wasm: -v $(DIR_ROOT):/src \ -w /src \ emscripten/emsdk:latest \ - bash -c "emcmake cmake -S . -B build_wasm -DCMAKE_BUILD_TYPE=Release && cmake --build build_wasm" - @echo "Output: build_wasm/coffee_crisis.html, .js, .wasm, .data" + bash -c "emcmake cmake -S . -B build/wasm -DCMAKE_BUILD_TYPE=Release && cmake --build build/wasm" + $(MKDIR) "$(DIST_DIR)/wasm" + cp build/wasm/$(TARGET_NAME).html $(DIST_DIR)/wasm/ + cp build/wasm/$(TARGET_NAME).js $(DIST_DIR)/wasm/ + cp build/wasm/$(TARGET_NAME).wasm $(DIST_DIR)/wasm/ + cp build/wasm/$(TARGET_NAME).data $(DIST_DIR)/wasm/ + @echo "Output: $(DIST_DIR)/wasm/" # ============================================================================== # REGLAS ESPECIALES