asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #65365 from akien-mga/3.x-html5-emsdk-3.1.20

Browse source
This commit is contained in:
Rémi Verschelde 2022-09-08 10:11:06 +02:00 committed by GitHub
commit 05e7275fce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats 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.x GODOT_BASE_BRANCH: 3.x
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.20
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"] = ""