Skip to content

Commit

Permalink
Merge pull request #90857 from Repiteo/scons/cleanup-opts
Browse files Browse the repository at this point in the history
SCons: Utilize native Variable alias functionality
  • Loading branch information
akien-mga committed Apr 22, 2024
2 parents 9498753 + 5a87f0d commit 462b894
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ if profile:
opts = Variables(customs, ARGUMENTS)

# Target build options
opts.Add("platform", "Target platform (%s)" % ("|".join(platform_list),), "")
opts.Add("p", "Platform (alias for 'platform')", "")
opts.Add(["platform", "p"], "Target platform (%s)" % "|".join(platform_list), "")
opts.Add(EnumVariable("target", "Compilation target", "editor", ("editor", "template_release", "template_debug")))
opts.Add(EnumVariable("arch", "CPU architecture", "auto", ["auto"] + architectures, architecture_aliases))
opts.Add(BoolVariable("dev_build", "Developer build with dev-only debugging code (DEV_ENABLED)", False))
Expand Down Expand Up @@ -285,13 +284,9 @@ if env["import_env_vars"]:

# Platform selection: validate input, and add options.

selected_platform = ""
selected_platform = env["platform"]

if env["platform"] != "":
selected_platform = env["platform"]
elif env["p"] != "":
selected_platform = env["p"]
else:
if selected_platform == "":
# Missing `platform` argument, try to detect platform automatically
if (
sys.platform.startswith("linux")
Expand Down

0 comments on commit 462b894

Please sign in to comment.