diff options
| author | filippocrocchini <filippo.crocchini@google.com> | 2019-06-06 22:06:24 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-08 21:41:57 +0300 |
| commit | 431a9ea664798c5e7b5063426fc92e58fd003038 (patch) | |
| tree | b026779f43b60a0fc8ea4ff3874b48f31b39197b | |
| parent | 342767d6c7e5d82b532bc2f4546d8e552b65949f (diff) | |
| download | meson-431a9ea664798c5e7b5063426fc92e58fd003038.zip meson-431a9ea664798c5e7b5063426fc92e58fd003038.tar.gz meson-431a9ea664798c5e7b5063426fc92e58fd003038.tar.bz2 | |
Moved RuntimeLibrary property to ItemDefinitionGroup/ClCompile
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index d25798e..ef08fdb 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -809,28 +809,32 @@ class Vs2010Backend(backends.Backend): # Incremental linking increases code size if '/INCREMENTAL:NO' in buildtype_link_args: ET.SubElement(type_config, 'LinkIncremental').text = 'false' + + # Build information + compiles = ET.SubElement(root, 'ItemDefinitionGroup') + clconf = ET.SubElement(compiles, 'ClCompile') # CRT type; debug or release if vscrt_type.value == 'from_buildtype': if self.buildtype == 'debug' or self.buildtype == 'debugoptimized': ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' else: ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreaded' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreaded' elif vscrt_type.value == 'mdd': ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' elif vscrt_type.value == 'mt': # FIXME, wrong ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreaded' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreaded' elif vscrt_type.value == 'mtd': # FIXME, wrong ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebug' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDebug' else: ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' - ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDLL' + ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDLL' # Debug format if '/ZI' in buildtype_args: ET.SubElement(type_config, 'DebugInformationFormat').text = 'EditAndContinue' @@ -865,9 +869,6 @@ class Vs2010Backend(backends.Backend): ET.SubElement(direlem, 'TargetName').text = tfilename[0] ET.SubElement(direlem, 'TargetExt').text = tfilename[1] - # Build information - compiles = ET.SubElement(root, 'ItemDefinitionGroup') - clconf = ET.SubElement(compiles, 'ClCompile') # Arguments, include dirs, defines for all files in the current target target_args = [] target_defines = [] |