Merge pull request #18 from brightray/better-windows-defaults

Improve Windows default build settings
This commit is contained in:
Adam Roben 2013-05-28 09:01:25 -07:00
commit 3070c6a723

View file

@ -80,7 +80,6 @@
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'Optimization': '<(win_debug_Optimization)', 'Optimization': '<(win_debug_Optimization)',
'PreprocessorDefinitions': ['_DEBUG'],
'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)', 'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)',
# We use Release to match the version of chromiumcontent.dll we # We use Release to match the version of chromiumcontent.dll we
# link against. # link against.
@ -170,18 +169,35 @@
'WIN32_LEAN_AND_MEAN', 'WIN32_LEAN_AND_MEAN',
'_ATL_NO_OPENGL', '_ATL_NO_OPENGL',
], ],
}, 'msvs_settings': {
'msvs_settings': { 'VCCLCompilerTool': {
'VCCLCompilerTool': { 'AdditionalOptions': ['/MP'],
'AdditionalOptions': ['/MP'], 'MinimalRebuild': 'false',
'MinimalRebuild': 'false', 'BufferSecurityCheck': 'true',
'BufferSecurityCheck': 'true', 'EnableFunctionLevelLinking': 'true',
'EnableFunctionLevelLinking': 'true', 'RuntimeTypeInfo': 'false',
'RuntimeTypeInfo': 'false', 'WarningLevel': '4',
'WarningLevel': '4', 'WarnAsError': 'true',
'WarnAsError': 'true', 'DebugInformationFormat': '3',
'DebugInformationFormat': '3', },
'VCLinkerTool': {
'GenerateDebugInformation': 'true',
'MapFileName': '$(OutDir)\\$(TargetName).map',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
},
}, },
'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
],
}, },
}], }],
], ],