From 0fb4fd0004cae8f4cd4961ca089e566ed12f909b Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Tue, 3 Jun 2025 16:40:12 +0800 Subject: [PATCH] (web) use mimalloc as default allocator on emscripten builds and set SAFE_HEAP to 1 by default for debug builds --- thermion_dart/native/web/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/thermion_dart/native/web/CMakeLists.txt b/thermion_dart/native/web/CMakeLists.txt index e44c839d..3fb1dc21 100644 --- a/thermion_dart/native/web/CMakeLists.txt +++ b/thermion_dart/native/web/CMakeLists.txt @@ -22,6 +22,7 @@ set(EMCC_CFLAGS ${EMCC_CFLAGS} -sEXPORTED_FUNCTIONS=_malloc,stackAlloc,_free,sta set(EMCC_CFLAGS ${EMCC_CFLAGS} -sFULL_ES3) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sPTHREAD_POOL_SIZE=1) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sALLOW_BLOCKING_ON_MAIN_THREAD=1) +set(EMCC_CFLAGS ${EMCC_CFLAGS} -sMALLOC=mimalloc) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sOFFSCREENCANVAS_SUPPORT=1) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sNO_DISABLE_EXCEPTION_CATCHING) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sASYNCIFY=0) @@ -35,8 +36,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(EMCC_CFLAGS ${EMCC_CFLAGS} -sASSERTIONS=2) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sGL_ASSERTIONS=1) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sGL_DEBUG=1) - # set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSAFE_HEAP=1) - #add_compile_definitions(ENABLE_TRACING=1) + set(EMCC_CFLAGS ${EMCC_CFLAGS} -sSAFE_HEAP=1) + # add_compile_definitions(ENABLE_TRACING=1) set(EMCC_CFLAGS ${EMCC_CFLAGS} -sWARN_UNALIGNED=1) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align -Wover-aligned") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wover-aligned")