summaryrefslogtreecommitdiff
path: root/common_conditions.gypi
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-21 20:29:05 +0000
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-21 20:29:05 +0000
commitf7e715b99e33861f63eec577c7049bf0d7e61fe8 (patch)
tree09003571cb346a0b3010e4f021eea893cd2ba607 /common_conditions.gypi
parent1a0ead01f7942809cd384057e16ebbb040c0c79e (diff)
downloadgyp-f7e715b99e33861f63eec577c7049bf0d7e61fe8.tar.gz
Enable init'ed but unused var warning on windows for closer parity with mac/linux warnings.
Review URL: https://codereview.chromium.org/12536008 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@8307 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common_conditions.gypi')
-rw-r--r--common_conditions.gypi15
1 files changed, 7 insertions, 8 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi
index df13425..2c7b16b 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -28,9 +28,11 @@
'msvs_cygwin_shell': 0,
'msvs_settings': {
'VCCLCompilerTool': {
- 'WarningLevel': '1',
+ 'WarningLevel': '3',
+ 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
'DebugInformationFormat': '3',
- 'AdditionalOptions': [ '/MP' ],
+ 'ExceptionHandling': '0',
+ 'AdditionalOptions': [ '/MP', ],
},
'VCLinkerTool': {
'AdditionalDependencies': [
@@ -44,13 +46,10 @@
'msvs_settings': {
'VCCLCompilerTool': {
'DebugInformationFormat': '4', # editAndContiue (/ZI)
- 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
'Optimization': '0', # optimizeDisabled (/Od)
'PreprocessorDefinitions': ['_DEBUG'],
'RuntimeLibrary': '3', # rtMultiThreadedDebugDLL (/MDd)
- 'ExceptionHandling': '0',
'RuntimeTypeInfo': 'false', # /GR-
- 'WarningLevel': '3', # level3 (/W3)
},
'VCLinkerTool': {
'GenerateDebugInformation': 'true', # /DEBUG
@@ -62,7 +61,6 @@
'msvs_settings': {
'VCCLCompilerTool': {
'DebugInformationFormat': '3', # programDatabase (/Zi)
- 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
'Optimization': '3', # full (/Ox)
'WholeProgramOptimization': 'true', #/GL
# Changing the floating point model requires rebaseling gm images
@@ -70,10 +68,8 @@
'FavorSizeOrSpeed': '1', # speed (/Ot)
'PreprocessorDefinitions': ['NDEBUG'],
'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD)
- 'ExceptionHandling': '0',
'EnableEnhancedInstructionSet': '2',# /arch:SSE2
'RuntimeTypeInfo': 'false', # /GR-
- 'WarningLevel': '3', # level3 (/W3)
},
'VCLinkerTool': {
'GenerateDebugInformation': 'true', # /DEBUG
@@ -115,6 +111,9 @@
'msvs_settings': {
'VCCLCompilerTool': {
'WarnAsError': 'true',
+ 'AdditionalOptions': [
+ '/we4189', # initialized but unused var warning
+ ],
},
},
}],