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

Side by Side Diff: build/common.gypi

Issue 12041037: Revert "Set msvs_cygwin_shell default to 0" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 3735 matching lines...) Expand 10 before | Expand all | Expand 10 after
3746 ], 3746 ],
3747 }], 3747 }],
3748 ], 3748 ],
3749 'msvs_system_include_dirs': [ 3749 'msvs_system_include_dirs': [
3750 '<(windows_sdk_path)/Include/shared', 3750 '<(windows_sdk_path)/Include/shared',
3751 '<(windows_sdk_path)/Include/um', 3751 '<(windows_sdk_path)/Include/um',
3752 '<(windows_sdk_path)/Include/winrt', 3752 '<(windows_sdk_path)/Include/winrt',
3753 '$(VSInstallDir)/VC/atlmfc/include', 3753 '$(VSInstallDir)/VC/atlmfc/include',
3754 ], 3754 ],
3755 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 3755 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
3756 'msvs_cygwin_shell': 0,
3757 'msvs_disabled_warnings': [4351, 4396, 4503, 4819, 3756 'msvs_disabled_warnings': [4351, 4396, 4503, 4819,
3758 # TODO(maruel): These warnings are level 4. They will be slowly 3757 # TODO(maruel): These warnings are level 4. They will be slowly
3759 # removed as code is fixed. 3758 # removed as code is fixed.
3760 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, 3759 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
3761 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 3760 4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701,
3762 4702, 4706, 3761 4702, 4706,
3763 ], 3762 ],
3764 'msvs_settings': { 3763 'msvs_settings': {
3765 'VCCLCompilerTool': { 3764 'VCCLCompilerTool': {
3766 'AdditionalOptions': ['/MP'], 3765 'AdditionalOptions': ['/MP'],
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
3985 # settings in target dicts. SYMROOT is a special case, because many other 3984 # settings in target dicts. SYMROOT is a special case, because many other
3986 # Xcode variables depend on it, including variables such as 3985 # Xcode variables depend on it, including variables such as
3987 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3986 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3988 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3987 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3989 # files to appear (when present) in the UI as actual files and not red 3988 # files to appear (when present) in the UI as actual files and not red
3990 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3989 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3991 # and therefore SYMROOT, needs to be set at the project level. 3990 # and therefore SYMROOT, needs to be set at the project level.
3992 'SYMROOT': '<(DEPTH)/xcodebuild', 3991 'SYMROOT': '<(DEPTH)/xcodebuild',
3993 }, 3992 },
3994 } 3993 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698