diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-12-11 20:23:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 20:23:13 +0100 |
| commit | 0c03d25ba499214bd04a55e5df9ea17c9b3a344a (patch) | |
| tree | e536b3eb019fb5fab30415e5fd7c8b7f400c709d | |
| parent | a9f444bbc307004c022e85e1b31fcfbd2e73566d (diff) | |
| parent | 8e5fbd43488ad39a9b987c9abc38134841f44024 (diff) | |
| download | redot-engine-0c03d25ba499214bd04a55e5df9ea17c9b3a344a.tar.gz | |
Merge pull request #86036 from adamscott/web-stack-size
Set what were default values for web platform linkerflags `-sSTACK_SIZE` and `-sDEFAULT_PTHREAD_STACK_SIZE`
| -rw-r--r-- | platform/web/detect.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/platform/web/detect.py b/platform/web/detect.py index b0044a80ff..579eaaff03 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -186,9 +186,18 @@ def configure(env: "Environment"): env["LIBPREFIXES"] = ["$LIBPREFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"] + # Get version info for checks below. + cc_version = get_compiler_version(env) + cc_semver = (cc_version["major"], cc_version["minor"], cc_version["patch"]) + env.Prepend(CPPPATH=["#platform/web"]) env.Append(CPPDEFINES=["WEB_ENABLED", "UNIX_ENABLED"]) + if cc_semver >= (3, 1, 25): + env.Append(LINKFLAGS=["-s", "STACK_SIZE=5MB"]) + else: + env.Append(LINKFLAGS=["-s", "TOTAL_STACK=5MB"]) + if env["opengl3"]: env.AppendUnique(CPPDEFINES=["GLES3_ENABLED"]) # This setting just makes WebGL 2 APIs available, it does NOT disable WebGL 1. @@ -203,13 +212,10 @@ def configure(env: "Environment"): env.Append(CPPDEFINES=["PTHREAD_NO_RENAME"]) env.Append(CCFLAGS=["-s", "USE_PTHREADS=1"]) env.Append(LINKFLAGS=["-s", "USE_PTHREADS=1"]) + env.Append(LINKFLAGS=["-s", "DEFAULT_PTHREAD_STACK_SIZE=2MB"]) env.Append(LINKFLAGS=["-s", "PTHREAD_POOL_SIZE=8"]) env.Append(LINKFLAGS=["-s", "WASM_MEM_MAX=2048MB"]) - # Get version info for checks below. - cc_version = get_compiler_version(env) - cc_semver = (cc_version["major"], cc_version["minor"], cc_version["patch"]) - if env["lto"] != "none": # Workaround https://github.com/emscripten-core/emscripten/issues/19781. if cc_semver >= (3, 1, 42) and cc_semver < (3, 1, 46): |