| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 5610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5621 ], | 5621 ], |
| 5622 ['msvs_xtree_patched!=1', { | 5622 ['msvs_xtree_patched!=1', { |
| 5623 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5623 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
| 5624 # it's enabled. This will generally only be true for system-level | 5624 # it's enabled. This will generally only be true for system-level |
| 5625 # installed Express users. | 5625 # installed Express users. |
| 5626 'msvs_disabled_warnings': [ | 5626 'msvs_disabled_warnings': [ |
| 5627 4702, # unreachable code | 5627 4702, # unreachable code |
| 5628 ], | 5628 ], |
| 5629 }], | 5629 }], |
| 5630 ], | 5630 ], |
| 5631 # Add extra include directories here that need to be in front of the |
| 5632 # installed and packaged include directories. This may be needed in |
| 5633 # order to force a particular SDK version, such as to get VS 2013 to use |
| 5634 # the Windows 10 SDK. Beware of making the INCLUDE variable excessively |
| 5635 # long, and be sure to make corresponding changes to |
| 5636 # build\toolchain\win\setup_toolchain.py |
| 5631 'msvs_system_include_dirs': [ | 5637 'msvs_system_include_dirs': [ |
| 5632 '<(windows_sdk_path)/Include/10.0.10586.0/shared', | |
| 5633 '<(windows_sdk_path)/Include/10.0.10586.0/um', | |
| 5634 '<(windows_sdk_path)/Include/10.0.10586.0/winrt', | |
| 5635 '$(VSInstallDir)/VC/atlmfc/include', | |
| 5636 ], | 5638 ], |
| 5637 'msvs_cygwin_shell': 0, | 5639 'msvs_cygwin_shell': 0, |
| 5638 'msvs_disabled_warnings': [ | 5640 'msvs_disabled_warnings': [ |
| 5639 # C4091: 'typedef ': ignored on left of 'X' when no variable is | 5641 # C4091: 'typedef ': ignored on left of 'X' when no variable is |
| 5640 # declared. | 5642 # declared. |
| 5641 # This happens in a number of Windows headers. Dumb. | 5643 # This happens in a number of Windows headers. Dumb. |
| 5642 4091, | 5644 4091, |
| 5643 | 5645 |
| 5644 # C4127: conditional expression is constant | 5646 # C4127: conditional expression is constant |
| 5645 # This warning can in theory catch dead code and other problems, but | 5647 # This warning can in theory catch dead code and other problems, but |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5704 4996, # 'X': was declared deprecated (for GetVersionEx). | 5706 4996, # 'X': was declared deprecated (for GetVersionEx). |
| 5705 | 5707 |
| 5706 # These are variable shadowing warnings that are new in VS2015. We | 5708 # These are variable shadowing warnings that are new in VS2015. We |
| 5707 # should work through these at some point -- they may be removed from | 5709 # should work through these at some point -- they may be removed from |
| 5708 # the RTM release in the /W4 set. | 5710 # the RTM release in the /W4 set. |
| 5709 4456, 4457, 4458, 4459, | 5711 4456, 4457, 4458, 4459, |
| 5710 | 5712 |
| 5711 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS | 5713 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS |
| 5712 # 2015 64-bit warning for integer to larger pointer | 5714 # 2015 64-bit warning for integer to larger pointer |
| 5713 4312, | 5715 4312, |
| 5716 |
| 5717 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious |
| 5718 # shift' warning and 4595 is an 'illegal inline operator new' warning |
| 5719 # Both are new in VS 2015 Update 2 and can safely be deferred for now. |
| 5720 4334, 4595, |
| 5714 ], | 5721 ], |
| 5715 'msvs_settings': { | 5722 'msvs_settings': { |
| 5716 'VCCLCompilerTool': { | 5723 'VCCLCompilerTool': { |
| 5717 'AdditionalOptions': ['/MP'], | 5724 'AdditionalOptions': ['/MP'], |
| 5718 'MinimalRebuild': 'false', | 5725 'MinimalRebuild': 'false', |
| 5719 'BufferSecurityCheck': 'true', | 5726 'BufferSecurityCheck': 'true', |
| 5720 'EnableFunctionLevelLinking': 'true', | 5727 'EnableFunctionLevelLinking': 'true', |
| 5721 'RuntimeTypeInfo': 'false', | 5728 'RuntimeTypeInfo': 'false', |
| 5722 'WarningLevel': '4', | 5729 'WarningLevel': '4', |
| 5723 'WarnAsError': 'true', | 5730 'WarnAsError': 'true', |
| (...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6349 # settings in target dicts. SYMROOT is a special case, because many other | 6356 # settings in target dicts. SYMROOT is a special case, because many other |
| 6350 # Xcode variables depend on it, including variables such as | 6357 # Xcode variables depend on it, including variables such as |
| 6351 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6358 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6352 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6359 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6353 # files to appear (when present) in the UI as actual files and not red | 6360 # files to appear (when present) in the UI as actual files and not red |
| 6354 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6361 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6355 # and therefore SYMROOT, needs to be set at the project level. | 6362 # and therefore SYMROOT, needs to be set at the project level. |
| 6356 'SYMROOT': '<(DEPTH)/xcodebuild', | 6363 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6357 }, | 6364 }, |
| 6358 } | 6365 } |
| OLD | NEW |