godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56964 from Calinou/scons-web-editor-force-threads

This commit is contained in:
Rémi Verschelde 2022-01-19 21:22:09 +01:00 committed by GitHub
parent 249c60e9d1 da19898c24
commit 84f5c79217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/javascript/detect.py
View File

@ -89,10 +89,10 @@ def configure(env):
if env["tools"]: if env["tools"]:
if not env["threads_enabled"]: if not env["threads_enabled"]:
print("Threads must be enabled to build the editor. Please add the 'threads_enabled=yes' option") print('Note: Forcing "threads_enabled=yes" as it is required for the web editor.')
sys.exit(255) env["threads_enabled"] = "yes"
if env["initial_memory"] < 64: if env["initial_memory"] < 64:
print("Editor build requires at least 64MiB of initial memory. Forcing it.") print('Note: Forcing "initial_memory=64" as it is required for the web editor.')
env["initial_memory"] = 64 env["initial_memory"] = 64
env.Append(CCFLAGS=["-frtti"]) env.Append(CCFLAGS=["-frtti"])
elif env["builtin_icu"]: elif env["builtin_icu"]: