diff options
| author | Peter Harris <pharris@opentext.com> | 2020-05-08 19:06:05 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-05-14 18:56:01 +0000 |
| commit | f1d00e86f1a83e2fed301c59d22f1415222b29e2 (patch) | |
| tree | f24f600c79ac2bc5c224a329242823f0babe45f5 | |
| parent | 8f1db99cec2e8c4eec0bb04698b3e0ce72f921e9 (diff) | |
| download | meson-f1d00e86f1a83e2fed301c59d22f1415222b29e2.zip meson-f1d00e86f1a83e2fed301c59d22f1415222b29e2.tar.gz meson-f1d00e86f1a83e2fed301c59d22f1415222b29e2.tar.bz2 | |
backend/vs: Fix b_vscrt=from_buildtype for debugoptimized
The ninja backend only uses the debug C runtime for 'debug', not for
'debugoptimized'.
The ninja backend always uses the DLL C runtime for all configurations.
The documentation matches the ninja backend.
Make the visual studio backend follow the documentation (and the precedent
set by the ninja backend).
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index b5803bf..614d357 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -821,12 +821,12 @@ class Vs2010Backend(backends.Backend): clconf = ET.SubElement(compiles, 'ClCompile') # CRT type; debug or release if vscrt_type.value == 'from_buildtype': - if self.buildtype == 'debug' or self.buildtype == 'debugoptimized': + if self.buildtype == 'debug': ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' else: ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' - ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreaded' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDLL' elif vscrt_type.value == 'mdd': ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' |