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

Side by Side Diff: build/common.gypi

Issue 160408: Make the Visual Studio /MP flag configurable. (Closed)
Patch Set: Created 11 years, 4 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
« 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 # Yes(1) means set use the common linker options. 65 # Yes(1) means set use the common linker options.
66 'msvs_use_common_linker_extras%': 1, 66 'msvs_use_common_linker_extras%': 1,
67 67
68 # TODO(sgk): eliminate this if possible. 68 # TODO(sgk): eliminate this if possible.
69 # It would be nicer to support this via a setting in 'target_defaults' 69 # It would be nicer to support this via a setting in 'target_defaults'
70 # in chrome/app/locales/locales.gypi overriding the setting in the 70 # in chrome/app/locales/locales.gypi overriding the setting in the
71 # 'Debug' configuration in the 'target_defaults' dict below, 71 # 'Debug' configuration in the 'target_defaults' dict below,
72 # but that doesn't work as we'd like. 72 # but that doesn't work as we'd like.
73 'msvs_debug_link_incremental%': '2', 73 'msvs_debug_link_incremental%': '2',
74 74
75 # Whether to use multiple cores to compile with visual studio. This is
76 # optional because it sometimes causes corruption on VS 2005.
77 'msvs_multi_core_compile%': '',
78
75 # The architecture that we're building on. 79 # The architecture that we're building on.
76 'target_arch%': 'ia32', 80 'target_arch%': 'ia32',
77 81
78 # By default linux does not use views. To turn on views in Linux 82 # By default linux does not use views. To turn on views in Linux
79 # set the variable GYP_DEFINES to "toolkit_views=1", or modify 83 # set the variable GYP_DEFINES to "toolkit_views=1", or modify
80 # ~/.gyp/include.gypi . 84 # ~/.gyp/include.gypi .
81 'toolkit_views%': 0, 85 'toolkit_views%': 0,
82 86
83 'chromeos%': 0, 87 'chromeos%': 0,
84 88
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 'msvs_settings': { 517 'msvs_settings': {
514 'VCCLCompilerTool': { 518 'VCCLCompilerTool': {
515 'MinimalRebuild': 'false', 519 'MinimalRebuild': 'false',
516 'ExceptionHandling': '0', 520 'ExceptionHandling': '0',
517 'BufferSecurityCheck': 'true', 521 'BufferSecurityCheck': 'true',
518 'EnableFunctionLevelLinking': 'true', 522 'EnableFunctionLevelLinking': 'true',
519 'RuntimeTypeInfo': 'false', 523 'RuntimeTypeInfo': 'false',
520 'WarningLevel': '3', 524 'WarningLevel': '3',
521 'WarnAsError': 'true', 525 'WarnAsError': 'true',
522 'DebugInformationFormat': '3', 526 'DebugInformationFormat': '3',
527 'conditions': [
528 [ 'msvs_multi_core_compile',
529 {'AdditionalOptions': '/MP'}, ],
530 ],
523 }, 531 },
524 'VCLibrarianTool': { 532 'VCLibrarianTool': {
525 'AdditionalOptions': '/ignore:4221', 533 'AdditionalOptions': '/ignore:4221',
526 'AdditionalLibraryDirectories': 534 'AdditionalLibraryDirectories':
527 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], 535 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
528 }, 536 },
529 'VCLinkerTool': { 537 'VCLinkerTool': {
530 'AdditionalDependencies': [ 538 'AdditionalDependencies': [
531 'wininet.lib', 539 'wininet.lib',
532 'version.lib', 540 'version.lib',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 # settings in target dicts. SYMROOT is a special case, because many other 617 # settings in target dicts. SYMROOT is a special case, because many other
610 # Xcode variables depend on it, including variables such as 618 # Xcode variables depend on it, including variables such as
611 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 619 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
612 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 620 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
613 # files to appear (when present) in the UI as actual files and not red 621 # files to appear (when present) in the UI as actual files and not red
614 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 622 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
615 # and therefore SYMROOT, needs to be set at the project level. 623 # and therefore SYMROOT, needs to be set at the project level.
616 'SYMROOT': '<(DEPTH)/xcodebuild', 624 'SYMROOT': '<(DEPTH)/xcodebuild',
617 }, 625 },
618 } 626 }
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