Fix missing space for wine argument, don't add devkitppc path if already specified

Former-commit-id: 23f62a2e12
This commit is contained in:
Phillip Stephens 2022-10-07 01:54:42 -07:00
parent 3e7a5d012c
commit 35810ce759
1 changed files with 2 additions and 2 deletions

View File

@ -1142,7 +1142,7 @@ n.newline()
n.comment("The arguments passed to configure.py, for rerunning it.") n.comment("The arguments passed to configure.py, for rerunning it.")
configure_args = sys.argv[1:] configure_args = sys.argv[1:]
# Ignore DEVKITPPC env var on Windows # Ignore DEVKITPPC env var on Windows
if os.name != "nt" and "DEVKITPPC" in os.environ: if os.name != "nt" and "DEVKITPPC" in os.environ and not args.devkitppc:
configure_args.extend(["--devkitppc", os.environ["DEVKITPPC"]]) configure_args.extend(["--devkitppc", os.environ["DEVKITPPC"]])
n.variable("configure_args", configure_args) n.variable("configure_args", configure_args)
n.newline() n.newline()
@ -1188,7 +1188,7 @@ else:
# MSYS2 # MSYS2
n.variable("wine", "") n.variable("wine", "")
elif args.wine: elif args.wine:
n.variable("wine", args.wine) n.variable("wine", args.wine + " ")
elif which("wibo") is not None: elif which("wibo") is not None:
n.variable("wine", "wibo ") n.variable("wine", "wibo ")
else: else: