diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-16 16:29:32 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-16 16:31:19 +0100 |
| commit | 0f84d8dc497e73a8ad21ae51bc4912082f2d2454 (patch) | |
| tree | df66ce27001881fc5da8e71b02a17157b099364d /platform/uwp | |
| parent | c514cc58224e5c973ac8be7bb6db7023d5c25906 (diff) | |
SCons: Add only selected platform's opts to env
Otherwise we can get situations where platform-specific opts with the same name
can override each other depending on the order at which platforms are parsed,
as was the case with `use_static_cpp` in Linux/Windows.
Fixes #44304.
This also has the added benefit that the `scons --help` output will now only
include the options which are relevant for the selected (or detected) platform.
Diffstat (limited to 'platform/uwp')
| -rw-r--r-- | platform/uwp/detect.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 2af7803749..fda8fdec66 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -30,7 +30,6 @@ def get_opts(): def get_flags(): - return [ ("tools", False), ("xaudio2", True), @@ -39,7 +38,6 @@ def get_flags(): def configure(env): - env.msvc = True if env["bits"] != "default": |