From 3f40456161edfb15975c962bdff6844cb2dcf4bd Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 28 May 2013 11:56:17 -0400 Subject: [PATCH] Make our Windows build settings actually take effect We need to put them inside the target_defaults dictionary. Now that these settings are turned on, we need to ignore some warnings that Chromium ignores. --- brightray/brightray.gypi | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index 14d10cc7a1..989e34d929 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -169,18 +169,30 @@ 'WIN32_LEAN_AND_MEAN', '_ATL_NO_OPENGL', ], - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': ['/MP'], - 'MinimalRebuild': 'false', - 'BufferSecurityCheck': 'true', - 'EnableFunctionLevelLinking': 'true', - 'RuntimeTypeInfo': 'false', - 'WarningLevel': '4', - 'WarnAsError': 'true', - 'DebugInformationFormat': '3', + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': ['/MP'], + 'MinimalRebuild': 'false', + 'BufferSecurityCheck': 'true', + 'EnableFunctionLevelLinking': 'true', + 'RuntimeTypeInfo': 'false', + 'WarningLevel': '4', + 'WarnAsError': 'true', + 'DebugInformationFormat': '3', + }, }, + 'msvs_disabled_warnings': [ + 4100, # unreferenced formal parameter + 4127, # conditional expression is constant + 4244, # 'initializing' : conversion from 'double' to 'size_t', possible loss of data + 4245, # 'initializing' : conversion from 'int' to 'const net::QuicVersionTag', signed/unsigned mismatch + 4251, # class 'std::xx' needs to have dll-interface. + 4310, # cast truncates constant value + 4480, # nonstandard extension used: specifying underlying type for enum + 4481, # nonstandard extension used: override specifier 'override' + 4512, # assignment operator could not be generated + 4702, # unreachable code + ], }, }], ],