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

Side by Side Diff: build/common.gypi

Issue 47363002: Make intsafe.h workaround global (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash.gyp ('k') | remoting/remoting.gyp » ('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 4416 matching lines...) Expand 10 before | Expand all | Expand 10 after
4427 # - warning LNK4078: multiple 'ATL' sections found with 4427 # - warning LNK4078: multiple 'ATL' sections found with
4428 # different attributes 4428 # different attributes
4429 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'], 4429 'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
4430 }, 4430 },
4431 }, 4431 },
4432 'msvs_system_include_dirs': [ 4432 'msvs_system_include_dirs': [
4433 '<(windows_driver_kit_path)/inc/atl71', 4433 '<(windows_driver_kit_path)/inc/atl71',
4434 '<(windows_driver_kit_path)/inc/mfc42', 4434 '<(windows_driver_kit_path)/inc/mfc42',
4435 ], 4435 ],
4436 }], 4436 }],
4437 # Workaround for intsafe in 2010 Express + WDK. ATL code uses
4438 # intsafe.h and both intsafe.h and stdint.h define INT8_MIN et al.
4439 # We can't use this workaround in third_party code because it has
4440 # various levels of intolerance for including stdint.h.
4441 ['msvs_express and chromium_code', {
4442 'msvs_system_include_dirs': [
4443 '<(DEPTH)/build',
4444 ],
4445 'msvs_settings': {
4446 'VCCLCompilerTool': {
4447 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
4448 },
4449 },
4450 }],
4437 ], 4451 ],
4438 'msvs_system_include_dirs': [ 4452 'msvs_system_include_dirs': [
4439 '<(windows_sdk_path)/Include/shared', 4453 '<(windows_sdk_path)/Include/shared',
4440 '<(windows_sdk_path)/Include/um', 4454 '<(windows_sdk_path)/Include/um',
4441 '<(windows_sdk_path)/Include/winrt', 4455 '<(windows_sdk_path)/Include/winrt',
4442 '$(VSInstallDir)/VC/atlmfc/include', 4456 '$(VSInstallDir)/VC/atlmfc/include',
4443 ], 4457 ],
4444 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 4458 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
4445 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, 4459 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819,
4446 # TODO(maruel): These warnings are level 4. They will be slowly 4460 # TODO(maruel): These warnings are level 4. They will be slowly
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
4732 # settings in target dicts. SYMROOT is a special case, because many other 4746 # settings in target dicts. SYMROOT is a special case, because many other
4733 # Xcode variables depend on it, including variables such as 4747 # Xcode variables depend on it, including variables such as
4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4748 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4749 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4736 # files to appear (when present) in the UI as actual files and not red 4750 # files to appear (when present) in the UI as actual files and not red
4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4751 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4738 # and therefore SYMROOT, needs to be set at the project level. 4752 # and therefore SYMROOT, needs to be set at the project level.
4739 'SYMROOT': '<(DEPTH)/xcodebuild', 4753 'SYMROOT': '<(DEPTH)/xcodebuild',
4740 }, 4754 },
4741 } 4755 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698