| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index e8042fea050ca0797c35939cf401baf0b2a6604e..eb486519e66329a969e783d548f980e7ca988e88 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -5628,11 +5628,13 @@
|
| ],
|
| }],
|
| ],
|
| + # Add extra include directories here that need to be in front of the
|
| + # installed and packaged include directories. This may be needed in
|
| + # order to force a particular SDK version, such as to get VS 2013 to use
|
| + # the Windows 10 SDK. Beware of making the INCLUDE variable excessively
|
| + # long, and be sure to make corresponding changes to
|
| + # build\toolchain\win\setup_toolchain.py
|
| 'msvs_system_include_dirs': [
|
| - '<(windows_sdk_path)/Include/10.0.10586.0/shared',
|
| - '<(windows_sdk_path)/Include/10.0.10586.0/um',
|
| - '<(windows_sdk_path)/Include/10.0.10586.0/winrt',
|
| - '$(VSInstallDir)/VC/atlmfc/include',
|
| ],
|
| 'msvs_cygwin_shell': 0,
|
| 'msvs_disabled_warnings': [
|
| @@ -5711,6 +5713,11 @@
|
| # TODO(brucedawson): http://crbug.com/554200 4312 is a VS
|
| # 2015 64-bit warning for integer to larger pointer
|
| 4312,
|
| +
|
| + # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious
|
| + # shift' warning and 4595 is an 'illegal inline operator new' warning
|
| + # Both are new in VS 2015 Update 2 and can safely be deferred for now.
|
| + 4334, 4595,
|
| ],
|
| 'msvs_settings': {
|
| 'VCCLCompilerTool': {
|
|
|