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

Side by Side Diff: build/common.gypi

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Some CR tweaks Created 5 years, 1 month 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
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 3116 matching lines...) Expand 10 before | Expand all | Expand 10 after
3127 ], 3127 ],
3128 }], 3128 }],
3129 [ 'OS=="win"', { 3129 [ 'OS=="win"', {
3130 'defines': [ 3130 'defines': [
3131 '_CRT_SECURE_NO_DEPRECATE', 3131 '_CRT_SECURE_NO_DEPRECATE',
3132 '_CRT_NONSTDC_NO_WARNINGS', 3132 '_CRT_NONSTDC_NO_WARNINGS',
3133 '_CRT_NONSTDC_NO_DEPRECATE', 3133 '_CRT_NONSTDC_NO_DEPRECATE',
3134 '_SCL_SECURE_NO_DEPRECATE', 3134 '_SCL_SECURE_NO_DEPRECATE',
3135 ], 3135 ],
3136 'msvs_disabled_warnings': [ 3136 'msvs_disabled_warnings': [
3137 # forcing value to bool 'true' or 'false' (performance warning)
3137 4800, 3138 4800,
3138 ], 3139 ],
3139 'msvs_settings': { 3140 'msvs_settings': {
3140 'VCCLCompilerTool': { 3141 'VCCLCompilerTool': {
3141 'WarningLevel': '3', 3142 'WarningLevel': '3',
3142 'WarnAsError': 'true', 3143 'WarnAsError': 'true',
3143 'Detect64BitPortabilityProblems': 'false', 3144 'Detect64BitPortabilityProblems': 'false',
3144 }, 3145 },
3145 }, 3146 },
3146 'conditions': [ 3147 'conditions': [
(...skipping 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after
5607 }, 5608 },
5608 ], 5609 ],
5609 ], 5610 ],
5610 }, 5611 },
5611 ], 5612 ],
5612 ['msvs_xtree_patched!=1', { 5613 ['msvs_xtree_patched!=1', {
5613 # If xtree hasn't been patched, then we disable C4702. Otherwise, 5614 # If xtree hasn't been patched, then we disable C4702. Otherwise,
5614 # it's enabled. This will generally only be true for system-level 5615 # it's enabled. This will generally only be true for system-level
5615 # installed Express users. 5616 # installed Express users.
5616 'msvs_disabled_warnings': [ 5617 'msvs_disabled_warnings': [
5617 4702, 5618 4702, # unreachable code
5618 ], 5619 ],
5619 }], 5620 }],
5620 ], 5621 ],
5621 'msvs_system_include_dirs': [ 5622 'msvs_system_include_dirs': [
5622 '<(windows_sdk_path)/Include/shared', 5623 '<(windows_sdk_path)/Include/shared',
5623 '<(windows_sdk_path)/Include/um', 5624 '<(windows_sdk_path)/Include/um',
5624 '<(windows_sdk_path)/Include/winrt', 5625 '<(windows_sdk_path)/Include/winrt',
5625 '$(VSInstallDir)/VC/atlmfc/include', 5626 '$(VSInstallDir)/VC/atlmfc/include',
5626 ], 5627 ],
5627 'msvs_cygwin_shell': 0, 5628 'msvs_cygwin_shell': 0,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
5691 4512, # Assignment operator could not be generated 5692 4512, # Assignment operator could not be generated
5692 4610, # Object can never be instantiated 5693 4610, # Object can never be instantiated
5693 4838, # Narrowing conversion. Doesn't seem to be very useful. 5694 4838, # Narrowing conversion. Doesn't seem to be very useful.
5694 4995, # 'X': name was marked as #pragma deprecated 5695 4995, # 'X': name was marked as #pragma deprecated
5695 4996, # 'X': was declared deprecated (for GetVersionEx). 5696 4996, # 'X': was declared deprecated (for GetVersionEx).
5696 5697
5697 # These are variable shadowing warnings that are new in VS2015. We 5698 # These are variable shadowing warnings that are new in VS2015. We
5698 # should work through these at some point -- they may be removed from 5699 # should work through these at some point -- they may be removed from
5699 # the RTM release in the /W4 set. 5700 # the RTM release in the /W4 set.
5700 4456, 4457, 4458, 4459, 5701 4456, 4457, 4458, 4459,
5702
5703 # The x64 builds with VS 2015 trigger hundreds of warnings about
5704 # pointer truncation but these are all or virtually all by design, and
5705 # therefore not worth fixing individually. The C4311 warnings are
5706 # particularly common in libxml. The C4312 warnings are particularly
5707 # common in libxml and v8.
5708 4311, # type cast: pointer truncation from pointer to smaller integer
Will Harris 2015/11/10 23:01:30 as per pkasting suggestion, please try and scope t
brucedawson 2015/11/11 01:09:04 I'll try that, and see how messy it gets.
5709 4312, # type cast: conversion from integer to larger pointer
5701 ], 5710 ],
5702 'msvs_settings': { 5711 'msvs_settings': {
5703 'VCCLCompilerTool': { 5712 'VCCLCompilerTool': {
5704 'AdditionalOptions': ['/MP'], 5713 'AdditionalOptions': ['/MP'],
5705 'MinimalRebuild': 'false', 5714 'MinimalRebuild': 'false',
5706 'BufferSecurityCheck': 'true', 5715 'BufferSecurityCheck': 'true',
5707 'EnableFunctionLevelLinking': 'true', 5716 'EnableFunctionLevelLinking': 'true',
5708 'RuntimeTypeInfo': 'false', 5717 'RuntimeTypeInfo': 'false',
5709 'WarningLevel': '4', 5718 'WarningLevel': '4',
5710 'WarnAsError': 'true', 5719 'WarnAsError': 'true',
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
6308 # settings in target dicts. SYMROOT is a special case, because many other 6317 # settings in target dicts. SYMROOT is a special case, because many other
6309 # Xcode variables depend on it, including variables such as 6318 # Xcode variables depend on it, including variables such as
6310 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6319 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6311 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6320 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6312 # files to appear (when present) in the UI as actual files and not red 6321 # files to appear (when present) in the UI as actual files and not red
6313 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6322 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6314 # and therefore SYMROOT, needs to be set at the project level. 6323 # and therefore SYMROOT, needs to be set at the project level.
6315 'SYMROOT': '<(DEPTH)/xcodebuild', 6324 'SYMROOT': '<(DEPTH)/xcodebuild',
6316 }, 6325 },
6317 } 6326 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698