Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(493)

Side by Side Diff: build/common.gypi

Issue 1740583002: Reland of Change default Windows compiler to VS 2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/get_landmines.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5622 matching lines...) Expand 10 before | Expand all | Expand 10 after
5633 ], 5633 ],
5634 ['msvs_xtree_patched!=1', { 5634 ['msvs_xtree_patched!=1', {
5635 # If xtree hasn't been patched, then we disable C4702. Otherwise, 5635 # If xtree hasn't been patched, then we disable C4702. Otherwise,
5636 # it's enabled. This will generally only be true for system-level 5636 # it's enabled. This will generally only be true for system-level
5637 # installed Express users. 5637 # installed Express users.
5638 'msvs_disabled_warnings': [ 5638 'msvs_disabled_warnings': [
5639 4702, # unreachable code 5639 4702, # unreachable code
5640 ], 5640 ],
5641 }], 5641 }],
5642 ], 5642 ],
5643 # Add extra include directories here that need to be in front of the
5644 # installed and packaged include directories. This may be needed in
5645 # order to force a particular SDK version, such as to get VS 2013 to use
5646 # the Windows 10 SDK. Beware of making the INCLUDE variable excessively
5647 # long, and be sure to make corresponding changes to
5648 # build\toolchain\win\setup_toolchain.py
5643 'msvs_system_include_dirs': [ 5649 'msvs_system_include_dirs': [
5644 '<(windows_sdk_path)/Include/10.0.10586.0/shared',
5645 '<(windows_sdk_path)/Include/10.0.10586.0/um',
5646 '<(windows_sdk_path)/Include/10.0.10586.0/winrt',
5647 '$(VSInstallDir)/VC/atlmfc/include',
5648 ], 5650 ],
5649 'msvs_cygwin_shell': 0, 5651 'msvs_cygwin_shell': 0,
5650 'msvs_disabled_warnings': [ 5652 'msvs_disabled_warnings': [
5651 # C4091: 'typedef ': ignored on left of 'X' when no variable is 5653 # C4091: 'typedef ': ignored on left of 'X' when no variable is
5652 # declared. 5654 # declared.
5653 # This happens in a number of Windows headers. Dumb. 5655 # This happens in a number of Windows headers. Dumb.
5654 4091, 5656 4091,
5655 5657
5656 # C4127: conditional expression is constant 5658 # C4127: conditional expression is constant
5657 # This warning can in theory catch dead code and other problems, but 5659 # This warning can in theory catch dead code and other problems, but
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
6361 # settings in target dicts. SYMROOT is a special case, because many other 6363 # settings in target dicts. SYMROOT is a special case, because many other
6362 # Xcode variables depend on it, including variables such as 6364 # Xcode variables depend on it, including variables such as
6363 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6365 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6364 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6366 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6365 # files to appear (when present) in the UI as actual files and not red 6367 # files to appear (when present) in the UI as actual files and not red
6366 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6368 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6367 # and therefore SYMROOT, needs to be set at the project level. 6369 # and therefore SYMROOT, needs to be set at the project level.
6368 'SYMROOT': '<(DEPTH)/xcodebuild', 6370 'SYMROOT': '<(DEPTH)/xcodebuild',
6369 }, 6371 },
6370 } 6372 }
OLDNEW
« no previous file with comments | « no previous file | build/get_landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698