Update emsdk version, and enable multithreading on web

This commit is contained in:
Yousef Khadadeh 2026-02-06 08:55:51 +03:00
parent 216469fab0
commit 435ee25848
6 changed files with 25 additions and 15 deletions

View file

@ -23,7 +23,6 @@ option(USE_THREADSAN "Enable Thread Sanitizer" OFF)
option(USE_MEMORYSAN "Enable Memory Sanitizer" OFF) option(USE_MEMORYSAN "Enable Memory Sanitizer" OFF)
option(NO_CONAN_BUILD "Not using conan to get packages" OFF) option(NO_CONAN_BUILD "Not using conan to get packages" OFF)
option(EMSCRIPTEN_SINGLE_HTML_FILE "Building with emscripten generates a single HTML file" OFF)
option(CONFIG_NEXT_TO_EXECUTABLE "Place configuration folder next to executable (portable executable)" OFF) option(CONFIG_NEXT_TO_EXECUTABLE "Place configuration folder next to executable (portable executable)" OFF)
option(MACOS_MAKE_BUNDLE "Package the application as a bundle" ON) option(MACOS_MAKE_BUNDLE "Package the application as a bundle" ON)
@ -233,14 +232,9 @@ if(EMSCRIPTEN)
target_link_options(infinipaint PRIVATE -O3) target_link_options(infinipaint PRIVATE -O3)
endif() endif()
target_compile_options(infinipaint PRIVATE -Wall -sUSE_HARFBUZZ=1 -fdiagnostics-color -sUSE_SDL=0 -include functional -fexceptions) target_compile_options(infinipaint PRIVATE -Wall -sUSE_HARFBUZZ=1 -fdiagnostics-color -sUSE_SDL=0 -include functional -fexceptions -pthread)
target_link_options(infinipaint PRIVATE --emrun -sUSE_HARFBUZZ=1 -sUSE_SDL=0 -sFULL_ES2 -sUSE_WEBGL2=1 -sFETCH --embed-file data -sALLOW_MEMORY_GROWTH=1 -sEXPORTED_RUNTIME_METHODS=ccall -sEXPORTED_FUNCTIONS=[_main,_malloc,_free] -sMAXIMUM_MEMORY=4GB -sSINGLE_FILE -lidbfs.js -sINITIAL_MEMORY=67108864 -fexceptions) target_link_options(infinipaint PRIVATE --emrun -sUSE_HARFBUZZ=1 -sUSE_SDL=0 -sFULL_ES2 -sUSE_WEBGL2=1 -sFETCH --embed-file data -sALLOW_MEMORY_GROWTH=1 -sEXPORTED_RUNTIME_METHODS=ccall -sEXPORTED_FUNCTIONS=[_main,_malloc,_free] -sMAXIMUM_MEMORY=4GB -sSINGLE_FILE -lidbfs.js -fexceptions -pthread) # -sINITIAL_MEMORY=67108864
if(EMSCRIPTEN_SINGLE_HTML_FILE)
target_link_options(infinipaint PRIVATE --shell-file emscripteninstall/singlefilereleaseshell.html)
set(CMAKE_EXECUTABLE_SUFFIX ".html")
else()
set(CMAKE_EXECUTABLE_SUFFIX ".js") set(CMAKE_EXECUTABLE_SUFFIX ".js")
endif()
message("In Emscripten Mode") message("In Emscripten Mode")
endif() endif()
@ -326,6 +320,7 @@ endif()
if(EMSCRIPTEN) if(EMSCRIPTEN)
add_subdirectory(deps/datachannel-wasm EXCLUDE_FROM_ALL) add_subdirectory(deps/datachannel-wasm EXCLUDE_FROM_ALL)
target_compile_options(datachannel-wasm PRIVATE -pthread)
target_link_libraries(infinipaint datachannel-wasm) target_link_libraries(infinipaint datachannel-wasm)
else() else()
target_link_libraries(infinipaint LibDataChannel::LibDataChannel CURL::libcurl) target_link_libraries(infinipaint LibDataChannel::LibDataChannel CURL::libcurl)

View file

@ -707,6 +707,9 @@ class ConanSkia(ConanFile):
cflags_c = [] cflags_c = []
cflags_cc = self.conf.get("tools.build:cxxflags", default=[], check_type=list) cflags_cc = self.conf.get("tools.build:cxxflags", default=[], check_type=list)
cflags_cc += [cppstd_flag(self)] cflags_cc += [cppstd_flag(self)]
if cflags_cc == [None]: # Fail to get c++ flags when using emsdk, so set the flags manually here
print("Failed to get C++ build flags, setting flags manually")
cflags_cc = ["-pthread"]
args += f"extra_cflags={json.dumps(cflags)}\n" args += f"extra_cflags={json.dumps(cflags)}\n"
args += f"extra_cflags_c={json.dumps(cflags_c)}\n" args += f"extra_cflags_c={json.dumps(cflags_c)}\n"

View file

@ -1,12 +1,19 @@
[settings] [settings]
os=Emscripten
arch=wasm arch=wasm
compiler=clang build_type=Release
compiler.version=15 compiler=emcc
compiler.cppstd=23 compiler.cppstd=23
compiler.libcxx=libc++ compiler.libcxx=libc++
build_type=Release # Optional settings to enable multithreading (see note below)
compiler.threads=posix
compiler.version=4.0.22
os=Emscripten
[tool_requires] [tool_requires]
emsdk/4.0.22
cmake/3.27.0 cmake/3.27.0
emsdk/3.1.73
[conf]
# Optional settings to enable memory allocation
tools.build:exelinkflags=['-sALLOW_MEMORY_GROWTH=1', '-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB', '-pthread']
tools.build:sharedlinkflags=['-sALLOW_MEMORY_GROWTH=1', '-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB', '-pthread']

View file

@ -2,6 +2,10 @@
#include <memory> #include <memory>
#include <functional> #include <functional>
#include <atomic> #include <atomic>
#include <string>
#include <fstream>
#include <sstream>
#include <algorithm>
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
#include <mutex> #include <mutex>

View file

@ -2,6 +2,7 @@
#include "FileDownloader.hpp" #include "FileDownloader.hpp"
#include <cstdio> #include <cstdio>
#include <iostream> #include <iostream>
#include <vector>
std::vector<FileDownloader::DownloadHandler> FileDownloader::currentDownloads; std::vector<FileDownloader::DownloadHandler> FileDownloader::currentDownloads;

View file

@ -81,7 +81,7 @@ void ScreenshotTool::gui_toolbox() {
if(t.gui.text_button_wide("Take Screenshot", "Take Screenshot")) { if(t.gui.text_button_wide("Take Screenshot", "Take Screenshot")) {
controls.selectionMode = 0; controls.selectionMode = 0;
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
take_screenshot("a" + controls.typeSelections[controls.selectedType]); take_screenshot("a" + controls.typeSelections[screenshotConfig.selectedType]);
#else #else
// We can't actually use the extension from the callback, so we have to set the extension of choice beforehand // We can't actually use the extension from the callback, so we have to set the extension of choice beforehand
Toolbar::ExtensionFilter setExtensionFilter; Toolbar::ExtensionFilter setExtensionFilter;