Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87739 from akien-mga/3.x-scons-web-workaround-emscripten-version-check

Browse Source 
[3.x] SCons: Fix Web build when compiler version isn't properly detected
This commit is contained in:
Rémi Verschelde
2024-01-30 15:10:06 +01:00
committed by GitHub
parent 561a6cd503 4206975e3a
commit 72ab4af489
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,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.45 EM_VERSION: 3.1.39
EM_CACHE_FOLDER: "emsdk-cache" EM_CACHE_FOLDER: "emsdk-cache"
concurrency: concurrency:

2
platform/javascript/detect.py
View File

@@ -176,7 +176,7 @@ def configure(env):
env["LIBSUFFIXES"] = ["$LIBSUFFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"]
# Get version info for checks below. # Get version info for checks below.
cc_semver = tuple(get_compiler_version(env)) cc_semver = tuple(get_compiler_version(env) or (3, 1, 39))
env.Prepend(CPPPATH=["#platform/javascript"]) env.Prepend(CPPPATH=["#platform/javascript"])
env.Append(CPPDEFINES=["JAVASCRIPT_ENABLED", "UNIX_ENABLED"]) env.Append(CPPDEFINES=["JAVASCRIPT_ENABLED", "UNIX_ENABLED"])