Update emsdk version, and enable multithreading on web
This commit is contained in:
parent
216469fab0
commit
435ee25848
6 changed files with 25 additions and 15 deletions
|
|
@ -707,6 +707,9 @@ class ConanSkia(ConanFile):
|
|||
cflags_c = []
|
||||
cflags_cc = self.conf.get("tools.build:cxxflags", default=[], check_type=list)
|
||||
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_c={json.dumps(cflags_c)}\n"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,19 @@
|
|||
[settings]
|
||||
os=Emscripten
|
||||
arch=wasm
|
||||
compiler=clang
|
||||
compiler.version=15
|
||||
build_type=Release
|
||||
compiler=emcc
|
||||
compiler.cppstd=23
|
||||
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]
|
||||
emsdk/4.0.22
|
||||
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']
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue