From d8cf5caeac979d7a3ae0a63d20ebdc89b0bc2cec Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 9 Jun 2026 00:49:14 +0000 Subject: [PATCH] fix wasm flags --- .ci/wasm/build.sh | 9 ++++++++- externals/cmake-modules/DetectPlatform.cmake | 15 --------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.ci/wasm/build.sh b/.ci/wasm/build.sh index bdaab223e0..27ae9cc218 100644 --- a/.ci/wasm/build.sh +++ b/.ci/wasm/build.sh @@ -71,5 +71,12 @@ emcmake cmake -B "$OUTDIR" -G "Unix Makefiles" \ -DYUZU_USE_BUNDLED_OPENSSL=OFF \ -DYUZU_USE_EXTERNAL_FFMPEG=ON \ -Dzstd_FORCE_BUNDLED=ON \ - -DOpenSSL_FORCE_BUNDLED=ON + -DOpenSSL_FORCE_BUNDLED=ON \ + -DEMSCRIPTEN_SYSTEM_PROCESSOR=wasm \ + -DCMAKE_C_FLAGS="-s MEMORY64 -m64 -pipe -sMEMORY64=1" \ + -DCMAKE_CXX_FLAGS="-s MEMORY64 -m64 -pipe -sMEMORY64=1" \ + -DCMAKE_EXE_LINKER_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" \ + -DCMAKE_C_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" \ + -DCMAKE_CXX_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" \ + cmake --build "$OUTDIR" -- -j$NUM_JOBS diff --git a/externals/cmake-modules/DetectPlatform.cmake b/externals/cmake-modules/DetectPlatform.cmake index 1847f330e4..c7ea85ffc9 100644 --- a/externals/cmake-modules/DetectPlatform.cmake +++ b/externals/cmake-modules/DetectPlatform.cmake @@ -155,19 +155,4 @@ endif() # awesome if (PLATFORM_FREEBSD OR PLATFORM_DRAGONFLYBSD) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/local/lib") -elseif (PLATFORM_EMSCRIPTEN) - set(EMSCRIPTEN_C_FLAGS "-s MEMORY64 -m64 -pipe -sMEMORY64=1") - set(EMSCRIPTEN_LINK_FLAGS "-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1") - - # This prevents FFmpeg and other libraries from assuming it's the host's CPU - # Additionally some Emscripten installs may not be very good... generally - set(EMSCRIPTEN_SYSTEM_PROCESSOR wasm) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EMSCRIPTEN_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${EMSCRIPTEN_C_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EMSCRIPTEN_LINK_FLAGS}") - set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} ${EMSCRIPTEN_LINK_FLAGS}") - set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} ${EMSCRIPTEN_LINK_FLAGS}") - - unset(EMSCRIPTEN_C_FLAGS) - unset(EMSCRIPTEN_LINK_FLAGS) endif()