Index: build/standalone.gypi |
diff --git a/build/standalone.gypi b/build/standalone.gypi |
index d335f05e49c5ce1b6c597f387eb8c60764b889e7..85cabca7dd1389141ae6a43244c7fe22ef310c90 100644 |
--- a/build/standalone.gypi |
+++ b/build/standalone.gypi |
@@ -165,6 +165,7 @@ |
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
'CharacterSet': '1', |
}, |
+ 'msvs_disabled_warnings': [4800], |
'msvs_settings': { |
'VCCLCompilerTool': { |
'MinimalRebuild': 'false', |
@@ -172,7 +173,6 @@ |
'EnableFunctionLevelLinking': 'true', |
'RuntimeTypeInfo': 'false', |
'WarningLevel': '3', |
- 'WarnAsError': 'false', |
'DebugInformationFormat': '3', |
'Detect64BitPortabilityProblems': 'false', |
'conditions': [ |
@@ -184,6 +184,11 @@ |
}, { |
'ExceptionHandling': '0', |
}], |
+ ['target_arch=="x64"', { |
+ 'WarnAsError': 'false', |
scottmg
2015/01/06 19:48:53
This deserves a comment and a link to a crbug if a
brucedawson
2015/01/06 21:01:17
Done.
|
+ }, { |
+ 'WarnAsError': 'true', |
+ }], |
], |
}, |
'VCLibrarianTool': { |