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

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: Removing unneeded include Created 5 years 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 | « base/win/win_util.h ('k') | chrome/app/chrome_watcher_client_unittest_win.cc » ('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 3142 matching lines...) Expand 10 before | Expand all | Expand 10 after
3153 ], 3153 ],
3154 }], 3154 }],
3155 [ 'OS=="win"', { 3155 [ 'OS=="win"', {
3156 'defines': [ 3156 'defines': [
3157 '_CRT_SECURE_NO_DEPRECATE', 3157 '_CRT_SECURE_NO_DEPRECATE',
3158 '_CRT_NONSTDC_NO_WARNINGS', 3158 '_CRT_NONSTDC_NO_WARNINGS',
3159 '_CRT_NONSTDC_NO_DEPRECATE', 3159 '_CRT_NONSTDC_NO_DEPRECATE',
3160 '_SCL_SECURE_NO_DEPRECATE', 3160 '_SCL_SECURE_NO_DEPRECATE',
3161 ], 3161 ],
3162 'msvs_disabled_warnings': [ 3162 'msvs_disabled_warnings': [
3163 # forcing value to bool 'true' or 'false' (performance warning)
3163 4800, 3164 4800,
3164 ], 3165 ],
3165 'msvs_settings': { 3166 'msvs_settings': {
3166 'VCCLCompilerTool': { 3167 'VCCLCompilerTool': {
3167 'WarningLevel': '3', 3168 'WarningLevel': '3',
3168 'WarnAsError': 'true', 3169 'WarnAsError': 'true',
3169 'Detect64BitPortabilityProblems': 'false', 3170 'Detect64BitPortabilityProblems': 'false',
3170 }, 3171 },
3171 }, 3172 },
3172 'conditions': [ 3173 'conditions': [
(...skipping 2456 matching lines...) Expand 10 before | Expand all | Expand 10 after
5629 }, 5630 },
5630 ], 5631 ],
5631 ], 5632 ],
5632 }, 5633 },
5633 ], 5634 ],
5634 ['msvs_xtree_patched!=1', { 5635 ['msvs_xtree_patched!=1', {
5635 # If xtree hasn't been patched, then we disable C4702. Otherwise, 5636 # If xtree hasn't been patched, then we disable C4702. Otherwise,
5636 # it's enabled. This will generally only be true for system-level 5637 # it's enabled. This will generally only be true for system-level
5637 # installed Express users. 5638 # installed Express users.
5638 'msvs_disabled_warnings': [ 5639 'msvs_disabled_warnings': [
5639 4702, 5640 4702, # unreachable code
5640 ], 5641 ],
5641 }], 5642 }],
5642 ], 5643 ],
5643 'msvs_system_include_dirs': [ 5644 'msvs_system_include_dirs': [
5644 '<(windows_sdk_path)/Include/10.0.10240.0/shared', 5645 '<(windows_sdk_path)/Include/10.0.10240.0/shared',
5645 '<(windows_sdk_path)/Include/10.0.10240.0/um', 5646 '<(windows_sdk_path)/Include/10.0.10240.0/um',
5646 '<(windows_sdk_path)/Include/10.0.10240.0/winrt', 5647 '<(windows_sdk_path)/Include/10.0.10240.0/winrt',
5647 '$(VSInstallDir)/VC/atlmfc/include', 5648 '$(VSInstallDir)/VC/atlmfc/include',
5648 ], 5649 ],
5649 'msvs_cygwin_shell': 0, 5650 'msvs_cygwin_shell': 0,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
5713 4512, # Assignment operator could not be generated 5714 4512, # Assignment operator could not be generated
5714 4610, # Object can never be instantiated 5715 4610, # Object can never be instantiated
5715 4838, # Narrowing conversion. Doesn't seem to be very useful. 5716 4838, # Narrowing conversion. Doesn't seem to be very useful.
5716 4995, # 'X': name was marked as #pragma deprecated 5717 4995, # 'X': name was marked as #pragma deprecated
5717 4996, # 'X': was declared deprecated (for GetVersionEx). 5718 4996, # 'X': was declared deprecated (for GetVersionEx).
5718 5719
5719 # These are variable shadowing warnings that are new in VS2015. We 5720 # These are variable shadowing warnings that are new in VS2015. We
5720 # should work through these at some point -- they may be removed from 5721 # should work through these at some point -- they may be removed from
5721 # the RTM release in the /W4 set. 5722 # the RTM release in the /W4 set.
5722 4456, 4457, 4458, 4459, 5723 4456, 4457, 4458, 4459,
5724
5725 # TODO(brucedawson): http://crbug.com/554200 4312 is a VS
5726 # 2015 64-bit warning for integer to larger pointer
5727 4312,
5723 ], 5728 ],
5724 'msvs_settings': { 5729 'msvs_settings': {
5725 'VCCLCompilerTool': { 5730 'VCCLCompilerTool': {
5726 'AdditionalOptions': ['/MP'], 5731 'AdditionalOptions': ['/MP'],
5727 'MinimalRebuild': 'false', 5732 'MinimalRebuild': 'false',
5728 'BufferSecurityCheck': 'true', 5733 'BufferSecurityCheck': 'true',
5729 'EnableFunctionLevelLinking': 'true', 5734 'EnableFunctionLevelLinking': 'true',
5730 'RuntimeTypeInfo': 'false', 5735 'RuntimeTypeInfo': 'false',
5731 'WarningLevel': '4', 5736 'WarningLevel': '4',
5732 'WarnAsError': 'true', 5737 'WarnAsError': 'true',
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
6371 # settings in target dicts. SYMROOT is a special case, because many other 6376 # settings in target dicts. SYMROOT is a special case, because many other
6372 # Xcode variables depend on it, including variables such as 6377 # Xcode variables depend on it, including variables such as
6373 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6378 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6374 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6379 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6375 # files to appear (when present) in the UI as actual files and not red 6380 # files to appear (when present) in the UI as actual files and not red
6376 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6381 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6377 # and therefore SYMROOT, needs to be set at the project level. 6382 # and therefore SYMROOT, needs to be set at the project level.
6378 'SYMROOT': '<(DEPTH)/xcodebuild', 6383 'SYMROOT': '<(DEPTH)/xcodebuild',
6379 }, 6384 },
6380 } 6385 }
OLDNEW
« no previous file with comments | « base/win/win_util.h ('k') | chrome/app/chrome_watcher_client_unittest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698