diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-08 09:59:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 09:59:28 +0100 |
| commit | 5260b6e046c244ed6376c47c7af5a0f27d934c12 (patch) | |
| tree | f137667e15a167cbab8eae06daa7a6bb3881247b /platform/windows | |
| parent | cea42faa77d72cdbea8ab7c38936e7c8722900d0 (diff) | |
| parent | 849c090343a22b98f0c977f2bb3469f709688de4 (diff) | |
Merge pull request #45818 from akien-mga/debug_symbols-bool
SCons: Fix debug_symbols tests after switch to BoolVariable
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/SCsub | 2 | ||||
| -rw-r--r-- | platform/windows/detect.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 0c9aa77803..47d8e14680 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -32,5 +32,5 @@ if env["vsproj"]: env.vs_srcs += ["platform/windows/" + str(x)] if not os.getenv("VCINSTALLDIR"): - if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: + if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, run_in_subprocess(platform_windows_builders.make_debug_mingw)) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index a675a2302f..97ecacd247 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -208,7 +208,7 @@ def configure_msvc(env, manual_msvc_config): env.AppendUnique(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["/DEBUG"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.AppendUnique(CCFLAGS=["/Z7"]) env.AppendUnique(LINKFLAGS=["/DEBUG"]) @@ -339,13 +339,13 @@ def configure_mingw(env): else: # optimize for size env.Prepend(CCFLAGS=["-Os"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "release_debug": env.Append(CCFLAGS=["-O2"]) env.Append(CPPDEFINES=["DEBUG_ENABLED"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) if env["optimize"] == "speed": # optimize for speed (default) env.Append(CCFLAGS=["-O2"]) |