diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-22 14:12:45 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-22 14:12:45 +0200 |
| commit | a50fe87b89e2b0be1db4088b3cb15b4716a2bfd9 (patch) | |
| tree | a2c8250f6ff53d1d88809138a898c5809f2e2baf | |
| parent | 4bba82f7eab86b62326066f28a041cc85cfda9fa (diff) | |
| parent | 0f691efb1b5946b94802f1a0d43a7baa3cace841 (diff) | |
| download | redot-engine-a50fe87b89e2b0be1db4088b3cb15b4716a2bfd9.tar.gz | |
Merge pull request #94078 from Repiteo/scons/msvc-flag-fix
SCons: Don't override cl flags on msvc
| -rw-r--r-- | platform/windows/detect.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 3b440e3f83..3671bbef08 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -301,7 +301,6 @@ def setup_msvc_manual(env: "SConsEnvironment"): print("Using VCVARS-determined MSVC, arch %s" % (env_arch)) -# FIXME: Likely overwrites command-line options for the msvc compiler. See #91883. def setup_msvc_auto(env: "SConsEnvironment"): """Set up MSVC using SCons's auto-detection logic""" @@ -334,6 +333,12 @@ def setup_msvc_auto(env: "SConsEnvironment"): env.Tool("msvc") env.Tool("mssdk") # we want the MS SDK + # Re-add potentially overwritten flags. + env.AppendUnique(CCFLAGS=env.get("ccflags", "").split()) + env.AppendUnique(CXXFLAGS=env.get("cxxflags", "").split()) + env.AppendUnique(CFLAGS=env.get("cflags", "").split()) + env.AppendUnique(RCFLAGS=env.get("rcflags", "").split()) + # Note: actual compiler version can be found in env['MSVC_VERSION'], e.g. "14.1" for VS2015 print("Using SCons-detected MSVC version %s, arch %s" % (env["MSVC_VERSION"], env["arch"])) |