diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 07:41:21 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 07:41:21 +0000 |
| commit | 6b0507b19e93b12330bca55841927cb03d9942a7 (patch) | |
| tree | 10847320637d799ca59e2cf178e70833b8322501 /build | |
| parent | 1163119b66586270926d92066ca699b2873d4694 (diff) | |
| download | chromium_src-6b0507b19e93b12330bca55841927cb03d9942a7.zip chromium_src-6b0507b19e93b12330bca55841927cb03d9942a7.tar.gz chromium_src-6b0507b19e93b12330bca55841927cb03d9942a7.tar.bz2 | |
Make RuntimeLibrary adjustable for Win/Debug build
TEST=trybot
Review URL: http://codereview.chromium.org/1995004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7b3b847..90529a5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -378,6 +378,11 @@ # See http://msdn.microsoft.com/en-us/library/aa652367(VS.71).aspx 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) + # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx + 'win_debug_RuntimeChecks%': '3', # 3 = all checks enabled, 0 = off + # See http://msdn.microsoft.com/en-us/library/47238hez(VS.71).aspx + 'win_debug_InlineFunctionExpansion%': '0', # 0 = off + 'win_release_InlineFunctionExpansion%': '2', # 2 = max 'release_extra_cflags%': '', 'debug_extra_cflags%': '', @@ -619,7 +624,8 @@ 'VCCLCompilerTool': { 'Optimization': '<(win_debug_Optimization)', 'PreprocessorDefinitions': ['_DEBUG'], - 'BasicRuntimeChecks': '3', + 'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)', + 'InlineFunctionExpansion': '<(win_debug_InlineFunctionExpansion)', 'RuntimeLibrary': '<(win_debug_RuntimeLibrary)', }, 'VCLinkerTool': { @@ -650,6 +656,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'Optimization': '<(win_release_Optimization)', + 'InlineFunctionExpansion': '<(win_release_InlineFunctionExpansion)', 'RuntimeLibrary': '<(win_release_RuntimeLibrary)', }, 'VCLinkerTool': { |