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

Merge pull request #84979 from Calinou/scons-web-platform-alias

Browse Source 
Alias `platform=javascript` SCons option to `platform=web`
This commit is contained in:
Yuri Sizov
2023-12-20 15:07:40 +01:00
parent e11e0a7f07 0185835988
commit 718598e470
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SConstruct
View File

@ -308,18 +308,14 @@ else:
if selected_platform != "": if selected_platform != "":
print("Automatically detected platform: " + selected_platform) print("Automatically detected platform: " + selected_platform)
if selected_platform in ["macos", "osx"]:
if selected_platform == "osx": if selected_platform == "osx":
# Deprecated alias kept for compatibility. # Deprecated alias kept for compatibility.
print('Platform "osx" has been renamed to "macos" in Godot 4. Building for platform "macos".') print('Platform "osx" has been renamed to "macos" in Godot 4. Building for platform "macos".')
# Alias for convenience.
selected_platform = "macos" selected_platform = "macos"
if selected_platform in ["ios", "iphone"]:
if selected_platform == "iphone": if selected_platform == "iphone":
# Deprecated alias kept for compatibility. # Deprecated alias kept for compatibility.
print('Platform "iphone" has been renamed to "ios" in Godot 4. Building for platform "ios".') print('Platform "iphone" has been renamed to "ios" in Godot 4. Building for platform "ios".')
# Alias for convenience.
selected_platform = "ios" selected_platform = "ios"
if selected_platform in ["linux", "bsd", "x11"]: if selected_platform in ["linux", "bsd", "x11"]:
@ -329,6 +325,11 @@ if selected_platform in ["linux", "bsd", "x11"]:
# Alias for convenience. # Alias for convenience.
selected_platform = "linuxbsd" selected_platform = "linuxbsd"
if selected_platform == "javascript":
# Deprecated alias kept for compatibility.
print('Platform "javascript" has been renamed to "web" in Godot 4. Building for platform "web".')
selected_platform = "web"
# Make sure to update this to the found, valid platform as it's used through the buildsystem as the reference. # Make sure to update this to the found, valid platform as it's used through the buildsystem as the reference.
# It should always be re-set after calling `opts.Update()` otherwise it uses the original input value. # It should always be re-set after calling `opts.Update()` otherwise it uses the original input value.
env_base["platform"] = selected_platform env_base["platform"] = selected_platform