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

Side by Side Diff: build/common.gypi

Issue 155057: enable mp (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 | build/internal/essential.vsprops » ('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) 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 [ 'OS=="win"', { 145 [ 'OS=="win"', {
146 'configuration_platform': 'Win32', 146 'configuration_platform': 'Win32',
147 'msvs_configuration_attributes': { 147 'msvs_configuration_attributes': {
148 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 148 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
149 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 149 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
150 'CharacterSet': '1', 150 'CharacterSet': '1',
151 }, 151 },
152 'msvs_settings': { 152 'msvs_settings': {
153 'VCCLCompilerTool': { 153 'VCCLCompilerTool': {
154 'Optimization': '0', 154 'Optimization': '0',
155 'AdditionalOptions': '/MP',
155 'PreprocessorDefinitions': ['_DEBUG'], 156 'PreprocessorDefinitions': ['_DEBUG'],
156 'BasicRuntimeChecks': '3', 157 'BasicRuntimeChecks': '3',
157 'RuntimeLibrary': '1', 158 'RuntimeLibrary': '1',
158 }, 159 },
159 'VCLinkerTool': { 160 'VCLinkerTool': {
160 'LinkIncremental': '<(msvs_debug_link_incremental)', 161 'LinkIncremental': '<(msvs_debug_link_incremental)',
161 }, 162 },
162 'VCResourceCompilerTool': { 163 'VCResourceCompilerTool': {
163 'PreprocessorDefinitions': ['_DEBUG'], 164 'PreprocessorDefinitions': ['_DEBUG'],
164 }, 165 },
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 '_HAS_TR1=0', 462 '_HAS_TR1=0',
462 ], 463 ],
463 'include_dirs': [ 464 'include_dirs': [
464 '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Include', 465 '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Include',
465 '$(VSInstallDir)/VC/atlmfc/include', 466 '$(VSInstallDir)/VC/atlmfc/include',
466 ], 467 ],
467 'msvs_cygwin_dirs': ['../third_party/cygwin'], 468 'msvs_cygwin_dirs': ['../third_party/cygwin'],
468 'msvs_disabled_warnings': [4396, 4503, 4819], 469 'msvs_disabled_warnings': [4396, 4503, 4819],
469 'msvs_settings': { 470 'msvs_settings': {
470 'VCCLCompilerTool': { 471 'VCCLCompilerTool': {
472 'AdditionalOptions': '/MP',
471 'MinimalRebuild': 'false', 473 'MinimalRebuild': 'false',
472 'ExceptionHandling': '0', 474 'ExceptionHandling': '0',
473 'BufferSecurityCheck': 'true', 475 'BufferSecurityCheck': 'true',
474 'EnableFunctionLevelLinking': 'true', 476 'EnableFunctionLevelLinking': 'true',
475 'RuntimeTypeInfo': 'false', 477 'RuntimeTypeInfo': 'false',
476 'WarningLevel': '3', 478 'WarningLevel': '3',
477 'WarnAsError': 'true', 479 'WarnAsError': 'true',
478 'DebugInformationFormat': '3', 480 'DebugInformationFormat': '3',
479 }, 481 },
480 'VCLibrarianTool': { 482 'VCLibrarianTool': {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 # settings in target dicts. SYMROOT is a special case, because many other 559 # settings in target dicts. SYMROOT is a special case, because many other
558 # Xcode variables depend on it, including variables such as 560 # Xcode variables depend on it, including variables such as
559 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 561 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
560 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 562 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
561 # files to appear (when present) in the UI as actual files and not red 563 # files to appear (when present) in the UI as actual files and not red
562 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 564 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
563 # and therefore SYMROOT, needs to be set at the project level. 565 # and therefore SYMROOT, needs to be set at the project level.
564 'SYMROOT': '<(DEPTH)/xcodebuild', 566 'SYMROOT': '<(DEPTH)/xcodebuild',
565 }, 567 },
566 } 568 }
OLDNEW
« no previous file with comments | « no previous file | build/internal/essential.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698