From adddaccb56ed30bc120bf24d2b1f711592bd0489 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Fri, 27 Jun 2025 10:43:16 +0100 Subject: [PATCH 1/2] Enable Windows Emscripten build --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6213b5b6..6f83ce9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,8 +432,11 @@ endif() if(EMSCRIPTEN) # Ensure required SDL2 ports (e.g. SDL2) are built before header preloading + if (CMAKE_C_COMPILER MATCHES ".bat") + set(embuilder_suffix .bat) + endif() execute_process( - COMMAND embuilder build sdl2 + COMMAND embuilder${embuilder_suffix} build sdl2 RESULT_VARIABLE SDL2_RESULT ) if(NOT SDL2_RESULT EQUAL 0) @@ -448,6 +451,8 @@ if(EMSCRIPTEN) xeus_wasm_link_options(xcpp "web,worker") string(REPLACE "@" "@@" ESCAPED_SYSROOT_PATH "${SYSROOT_PATH}") string(REPLACE "@" "@@" ESCAPED_XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}") + string(REPLACE "\\" "/" ESCAPED_XEUS_CPP_RESOURCE_DIR "${ESCAPED_XEUS_CPP_RESOURCE_DIR}") + string(REPLACE "\\" "/" ESCAPED_SYSROOT_PATH "${ESCAPED_SYSROOT_PATH}") target_link_options(xcpp PUBLIC "SHELL: -s USE_SDL=2" PUBLIC "SHELL: --preload-file ${ESCAPED_SYSROOT_PATH}/include@/include" From 5391dcd8de8c7819ee3ad51b4ddfe2e87a9cac43 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 14 Jul 2025 10:05:19 +0100 Subject: [PATCH 2/2] Try using EMCC_SUFFIX instead of making our own --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f83ce9f..8cf8d66a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,11 +432,8 @@ endif() if(EMSCRIPTEN) # Ensure required SDL2 ports (e.g. SDL2) are built before header preloading - if (CMAKE_C_COMPILER MATCHES ".bat") - set(embuilder_suffix .bat) - endif() execute_process( - COMMAND embuilder${embuilder_suffix} build sdl2 + COMMAND embuilder${EMCC_SUFFIX} build sdl2 RESULT_VARIABLE SDL2_RESULT ) if(NOT SDL2_RESULT EQUAL 0)