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

Side by Side Diff: build/common.gypi

Issue 260903003: Enable "unreachable code" warning for MSVC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Leave 4702 disabled for VC Express Created 6 years, 7 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 4898 matching lines...) Expand 10 before | Expand all | Expand 10 after
4909 'AdditionalLibraryDirectories': 4909 'AdditionalLibraryDirectories':
4910 ['<(windows_driver_kit_path)/lib/ATL/amd64'], 4910 ['<(windows_driver_kit_path)/lib/ATL/amd64'],
4911 }, 4911 },
4912 'VCLinkerTool': { 4912 'VCLinkerTool': {
4913 'AdditionalLibraryDirectories': 4913 'AdditionalLibraryDirectories':
4914 ['<(windows_driver_kit_path)/lib/ATL/amd64'], 4914 ['<(windows_driver_kit_path)/lib/ATL/amd64'],
4915 }, 4915 },
4916 }, 4916 },
4917 }, 4917 },
4918 }, 4918 },
4919 # Warning 4702 should be re-enabled once Express users are updated
4920 # to VS2013 Update 2.
scottmg 2014/05/22 23:39:06 Please add crbug/what 4702 is here.
Peter Kasting 2014/05/23 17:51:16 Done.
4921 'msvs_disabled_warnings': [
4922 4702
4923 ],
4919 'msvs_settings': { 4924 'msvs_settings': {
4920 'VCLinkerTool': { 4925 'VCLinkerTool': {
4921 # Explicitly required when using the ATL with express 4926 # Explicitly required when using the ATL with express
4922 'AdditionalDependencies': ['atlthunk.lib'], 4927 'AdditionalDependencies': ['atlthunk.lib'],
4923 4928
4924 # ATL 8.0 included in WDK 7.1 makes the linker to generate 4929 # ATL 8.0 included in WDK 7.1 makes the linker to generate
4925 # almost eight hundred LNK4254 and LNK4078 warnings: 4930 # almost eight hundred LNK4254 and LNK4078 warnings:
4926 # - warning LNK4254: section 'ATL' (50000040) merged into 4931 # - warning LNK4254: section 'ATL' (50000040) merged into
4927 # '.rdata' (40000040) with different attributes 4932 # '.rdata' (40000040) with different attributes
4928 # - warning LNK4078: multiple 'ATL' sections found with 4933 # - warning LNK4078: multiple 'ATL' sections found with
4929 # different attributes 4934 # different attributes
4930 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], 4935 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
4931 }, 4936 },
4932 }, 4937 },
4933 'msvs_system_include_dirs': [ 4938 'msvs_system_include_dirs': [
4934 '<(windows_driver_kit_path)/inc/atl71', 4939 '<(windows_driver_kit_path)/inc/atl71',
4935 '<(windows_driver_kit_path)/inc/mfc42', 4940 '<(windows_driver_kit_path)/inc/mfc42',
4936 ], 4941 ],
4937 }], 4942 }],
4938 ], 4943 ],
4939 'msvs_system_include_dirs': [ 4944 'msvs_system_include_dirs': [
4940 '<(windows_sdk_path)/Include/shared', 4945 '<(windows_sdk_path)/Include/shared',
4941 '<(windows_sdk_path)/Include/um', 4946 '<(windows_sdk_path)/Include/um',
4942 '<(windows_sdk_path)/Include/winrt', 4947 '<(windows_sdk_path)/Include/winrt',
4943 '$(VSInstallDir)/VC/atlmfc/include', 4948 '$(VSInstallDir)/VC/atlmfc/include',
4944 ], 4949 ],
4945 'msvs_cygwin_shell': 0, 4950 'msvs_cygwin_shell': 0,
4946 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, 4951 'msvs_disabled_warnings': [
4952 4351, 4355, 4396, 4503, 4819,
4947 # TODO(maruel): These warnings are level 4. They will be slowly 4953 # TODO(maruel): These warnings are level 4. They will be slowly
4948 # removed as code is fixed. 4954 # removed as code is fixed.
4949 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, 4955 4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
4950 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702, 4956 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706,
4951 4706,
4952 ], 4957 ],
4953 'msvs_settings': { 4958 'msvs_settings': {
4954 'VCCLCompilerTool': { 4959 'VCCLCompilerTool': {
4955 'AdditionalOptions': ['/MP'], 4960 'AdditionalOptions': ['/MP'],
4956 'MinimalRebuild': 'false', 4961 'MinimalRebuild': 'false',
4957 'BufferSecurityCheck': 'true', 4962 'BufferSecurityCheck': 'true',
4958 'EnableFunctionLevelLinking': 'true', 4963 'EnableFunctionLevelLinking': 'true',
4959 'RuntimeTypeInfo': 'false', 4964 'RuntimeTypeInfo': 'false',
4960 'WarningLevel': '4', 4965 'WarningLevel': '4',
4961 'WarnAsError': 'true', 4966 'WarnAsError': 'true',
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
5321 # settings in target dicts. SYMROOT is a special case, because many other 5326 # settings in target dicts. SYMROOT is a special case, because many other
5322 # Xcode variables depend on it, including variables such as 5327 # Xcode variables depend on it, including variables such as
5323 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5328 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5324 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5329 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5325 # files to appear (when present) in the UI as actual files and not red 5330 # files to appear (when present) in the UI as actual files and not red
5326 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5331 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5327 # and therefore SYMROOT, needs to be set at the project level. 5332 # and therefore SYMROOT, needs to be set at the project level.
5328 'SYMROOT': '<(DEPTH)/xcodebuild', 5333 'SYMROOT': '<(DEPTH)/xcodebuild',
5329 }, 5334 },
5330 } 5335 }
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