| 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 5614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5625 ], | 5625 ], |
| 5626 ['msvs_xtree_patched!=1', { | 5626 ['msvs_xtree_patched!=1', { |
| 5627 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5627 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
| 5628 # it's enabled. This will generally only be true for system-level | 5628 # it's enabled. This will generally only be true for system-level |
| 5629 # installed Express users. | 5629 # installed Express users. |
| 5630 'msvs_disabled_warnings': [ | 5630 'msvs_disabled_warnings': [ |
| 5631 4702, # unreachable code | 5631 4702, # unreachable code |
| 5632 ], | 5632 ], |
| 5633 }], | 5633 }], |
| 5634 ], | 5634 ], |
| 5635 # Add extra include directories here that need to be in front of the |
| 5636 # installed and packaged include directories. This may be needed in |
| 5637 # order to force a particular SDK version, such as to get VS 2013 to use |
| 5638 # the Windows 10 SDK. Beware of making the INCLUDE variable excessively |
| 5639 # long, and be sure to make corresponding changes to |
| 5640 # build\toolchain\win\setup_toolchain.py |
| 5635 'msvs_system_include_dirs': [ | 5641 'msvs_system_include_dirs': [ |
| 5636 '<(windows_sdk_path)/Include/10.0.10586.0/shared', | |
| 5637 '<(windows_sdk_path)/Include/10.0.10586.0/um', | |
| 5638 '<(windows_sdk_path)/Include/10.0.10586.0/winrt', | |
| 5639 '$(VSInstallDir)/VC/atlmfc/include', | |
| 5640 ], | 5642 ], |
| 5641 'msvs_cygwin_shell': 0, | 5643 'msvs_cygwin_shell': 0, |
| 5642 'msvs_disabled_warnings': [ | 5644 'msvs_disabled_warnings': [ |
| 5643 # C4091: 'typedef ': ignored on left of 'X' when no variable is | 5645 # C4091: 'typedef ': ignored on left of 'X' when no variable is |
| 5644 # declared. | 5646 # declared. |
| 5645 # This happens in a number of Windows headers. Dumb. | 5647 # This happens in a number of Windows headers. Dumb. |
| 5646 4091, | 5648 4091, |
| 5647 | 5649 |
| 5648 # C4127: conditional expression is constant | 5650 # C4127: conditional expression is constant |
| 5649 # This warning can in theory catch dead code and other problems, but | 5651 # This warning can in theory catch dead code and other problems, but |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6353 # settings in target dicts. SYMROOT is a special case, because many other | 6355 # settings in target dicts. SYMROOT is a special case, because many other |
| 6354 # Xcode variables depend on it, including variables such as | 6356 # Xcode variables depend on it, including variables such as |
| 6355 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6357 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6356 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6358 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6357 # files to appear (when present) in the UI as actual files and not red | 6359 # files to appear (when present) in the UI as actual files and not red |
| 6358 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6360 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6359 # and therefore SYMROOT, needs to be set at the project level. | 6361 # and therefore SYMROOT, needs to be set at the project level. |
| 6360 'SYMROOT': '<(DEPTH)/xcodebuild', | 6362 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6361 }, | 6363 }, |
| 6362 } | 6364 } |
| OLD | NEW |