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).
pull/7132/head
Peter Harris 5 years ago committed by Nirbheek Chauhan
parent 8f1db99cec
commit f1d00e86f1
  1. 4
      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'

Loading…
Cancel
Save