From 3bb6f1bb6861930ea1abcc0d7883142ea0826b3b Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 18 Sep 2024 18:38:00 +0200 Subject: [PATCH] Adjust link flags for emscripten. Increase the thread pool to account for background jobs. Increase stack size, as it was overflowing. Move the pthread flag out of config.cmake. --- cmake/config.cmake | 5 ----- profiler/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmake/config.cmake b/cmake/config.cmake index 6a6e1583..00ed2729 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -37,11 +37,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT EMSCRIPTEN) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) endif() -if(EMSCRIPTEN) - add_compile_options(-pthread) - add_link_options(-pthread) -endif() - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT EMSCRIPTEN) find_program(MOLD_LINKER mold) if(MOLD_LINKER) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index ee99cd2e..eff957cc 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -192,7 +192,7 @@ endif() if(EMSCRIPTEN) set_property(TARGET ${PROJECT_NAME} PROPERTY COMPILE_FLAGS "-sUSE_FREETYPE=1 -pthread -DIMGUI_IMPL_OPENGL_ES2") - set_property(TARGET ${PROJECT_NAME} PROPERTY LINK_FLAGS "-sASSERTIONS=0 -sUSE_GLFW=3 -sINITIAL_MEMORY=384mb -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4gb -sWASM_BIGINT=1 -sPTHREAD_POOL_SIZE=4 -sEXPORTED_FUNCTIONS=_main,_nativeResize,_nativeOpenFile -sEXPORTED_RUNTIME_METHODS=ccall -sENVIRONMENT=web,worker --preload-file embed.tracy") + target_link_options(${PROJECT_NAME} PRIVATE -pthread -sASSERTIONS=0 -sUSE_GLFW=3 -sINITIAL_MEMORY=384mb -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4gb -sSTACK_SIZE=1048576 -sWASM_BIGINT=1 -sPTHREAD_POOL_SIZE=8 -sEXPORTED_FUNCTIONS=_main,_nativeResize,_nativeOpenFile -sEXPORTED_RUNTIME_METHODS=ccall -sENVIRONMENT=web,worker --preload-file embed.tracy) file(DOWNLOAD https://share.nereid.pl/i/embed.tracy ${CMAKE_CURRENT_BINARY_DIR}/embed.tracy EXPECTED_MD5 ca0fa4f01e7b8ca5581daa16b16c768d) file(COPY ${CMAKE_CURRENT_LIST_DIR}/wasm/index.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR})