godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

HTML5: Fix warning with Emscripten 3.1.20

Browse Source 
Use version 3.1.14 for CI like for official builds.

(cherry picked from commit 5271d69909)
This commit is contained in:
Rémi Verschelde
2022-09-05 15:37:33 +02:00
parent 5d1b579455
commit 2bb8183011
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/javascript_builds.yml vendored
View File

@@ -6,7 +6,7 @@ env:
# Only used for the cache key. Increment version to force clean build. # Only used for the cache key. Increment version to force clean build.
GODOT_BASE_BRANCH: 3.5 GODOT_BASE_BRANCH: 3.5
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
EM_VERSION: 3.1.10 EM_VERSION: 3.1.14
EM_CACHE_FOLDER: "emsdk-cache" EM_CACHE_FOLDER: "emsdk-cache"
concurrency: concurrency:

4
platform/javascript/detect.py
View File

@@ -157,9 +157,9 @@ def configure(env):
env["ARCOM_POSIX"] = env["ARCOM"].replace("$TARGET", "$TARGET.posix").replace("$SOURCES", "$SOURCES.posix") env["ARCOM_POSIX"] = env["ARCOM"].replace("$TARGET", "$TARGET.posix").replace("$SOURCES", "$SOURCES.posix")
env["ARCOM"] = "${TEMPFILE(ARCOM_POSIX)}" env["ARCOM"] = "${TEMPFILE(ARCOM_POSIX)}"
# All intermediate files are just LLVM bitcode. # All intermediate files are just object files.
env["OBJPREFIX"] = "" env["OBJPREFIX"] = ""
env["OBJSUFFIX"] = ".bc" env["OBJSUFFIX"] = ".o"
env["PROGPREFIX"] = "" env["PROGPREFIX"] = ""
# Program() output consists of multiple files, so specify suffixes manually at builder. # Program() output consists of multiple files, so specify suffixes manually at builder.
env["PROGSUFFIX"] = "" env["PROGSUFFIX"] = ""