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 5654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5665 ], | 5665 ], |
5666 ['msvs_xtree_patched!=1', { | 5666 ['msvs_xtree_patched!=1', { |
5667 # If xtree hasn't been patched, then we disable C4702. Otherwise, | 5667 # If xtree hasn't been patched, then we disable C4702. Otherwise, |
5668 # it's enabled. This will generally only be true for system-level | 5668 # it's enabled. This will generally only be true for system-level |
5669 # installed Express users. | 5669 # installed Express users. |
5670 'msvs_disabled_warnings': [ | 5670 'msvs_disabled_warnings': [ |
5671 4702, # unreachable code | 5671 4702, # unreachable code |
5672 ], | 5672 ], |
5673 }], | 5673 }], |
5674 ], | 5674 ], |
5675 # Add extra include directories here that need to be in front of the | |
5676 # installed and packaged include directories. This may be needed in | |
5677 # order to force a particular SDK version, such as to get VS 2013 to use | |
5678 # the Windows 10 SDK. Beware of making the INCLUDE variable excessively | |
5679 # long, and be sure to make corresponding changes to | |
5680 # build\toolchain\win\setup_toolchain.py | |
5675 'msvs_system_include_dirs': [ | 5681 'msvs_system_include_dirs': [ |
5676 '<(windows_sdk_path)/Include/10.0.10586.0/shared', | |
scottmg
2016/02/05 21:52:45
Won't these be needed for DEPOT_TOOLS_WIN_TOOLCHAI
brucedawson
2016/02/05 22:28:19
Only with VS 2013, which this switches away from (
| |
5677 '<(windows_sdk_path)/Include/10.0.10586.0/um', | |
5678 '<(windows_sdk_path)/Include/10.0.10586.0/winrt', | |
5679 '$(VSInstallDir)/VC/atlmfc/include', | |
5680 ], | 5682 ], |
5681 'msvs_cygwin_shell': 0, | 5683 'msvs_cygwin_shell': 0, |
5682 'msvs_disabled_warnings': [ | 5684 'msvs_disabled_warnings': [ |
5683 # C4091: 'typedef ': ignored on left of 'X' when no variable is | 5685 # C4091: 'typedef ': ignored on left of 'X' when no variable is |
5684 # declared. | 5686 # declared. |
5685 # This happens in a number of Windows headers. Dumb. | 5687 # This happens in a number of Windows headers. Dumb. |
5686 4091, | 5688 4091, |
5687 | 5689 |
5688 # C4127: conditional expression is constant | 5690 # C4127: conditional expression is constant |
5689 # This warning can in theory catch dead code and other problems, but | 5691 # 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... | |
6393 # settings in target dicts. SYMROOT is a special case, because many other | 6395 # settings in target dicts. SYMROOT is a special case, because many other |
6394 # Xcode variables depend on it, including variables such as | 6396 # Xcode variables depend on it, including variables such as |
6395 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6397 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6396 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6398 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6397 # files to appear (when present) in the UI as actual files and not red | 6399 # files to appear (when present) in the UI as actual files and not red |
6398 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6400 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6399 # and therefore SYMROOT, needs to be set at the project level. | 6401 # and therefore SYMROOT, needs to be set at the project level. |
6400 'SYMROOT': '<(DEPTH)/xcodebuild', | 6402 'SYMROOT': '<(DEPTH)/xcodebuild', |
6401 }, | 6403 }, |
6402 } | 6404 } |
OLD | NEW |