Explicitly enable /INCREMENTAL linking for gyp-generated Debug builds.
Explicitly disable it (/INCREMENTAL:NO) for Release, and for the following targets that require it: chrome.dll interactive_ui_tests.exe perf_tests.exe unit_tests.exe Explicitly specificy /SUBSYSTEM:CONSOLE as default for linking, and match current practice by overriding with /SUBSYSTEM:WINDOWS for: chrome.exe chrome.dll media_player.exe sandbox_poc.exe TEST=none BUG=none Review URL: http://codereview.chromium.org/115664 git-svn-id: http://src.chromium.org/svn/trunk/src/build@16698 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
e19c988e41
Коммит
d0e8b08257
21
common.gypi
21
common.gypi
|
@ -97,6 +97,11 @@
|
|||
],
|
||||
'default_configuration': 'Debug',
|
||||
'configurations': {
|
||||
# VCLinkerTool LinkIncremental values below:
|
||||
# 0 == default
|
||||
# 1 == /INCREMENTAL:NO
|
||||
# 2 == /INCREMENTAL
|
||||
# Debug links incremental, Release does not.
|
||||
'Debug': {
|
||||
'conditions': [
|
||||
[ 'OS=="mac"', {
|
||||
|
@ -120,7 +125,7 @@
|
|||
'RuntimeLibrary': '1',
|
||||
},
|
||||
'VCLinkerTool': {
|
||||
'LinkIncremental': '1',
|
||||
'LinkIncremental': '2',
|
||||
},
|
||||
'VCResourceCompilerTool': {
|
||||
'PreprocessorDefinitions': ['_DEBUG'],
|
||||
|
@ -143,6 +148,13 @@
|
|||
'configuration_platform': 'Win32',
|
||||
'msvs_props': ['release.vsprops'],
|
||||
}],
|
||||
[ 'OS=="win"', {
|
||||
'msvs_settings': {
|
||||
'VCLinkerTool': {
|
||||
'LinkIncremental': '1',
|
||||
},
|
||||
},
|
||||
}],
|
||||
],
|
||||
},
|
||||
},
|
||||
|
@ -442,6 +454,13 @@
|
|||
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
|
||||
'TargetMachine': '1',
|
||||
'FixedBaseAddress': '1',
|
||||
# SubSystem values:
|
||||
# 0 == not set
|
||||
# 1 == /SUBSYSTEM:CONSOLE
|
||||
# 2 == /SUBSYSTEM:WINDOWS
|
||||
# Most of the executables we'll ever create are tests
|
||||
# and utilities with console output.
|
||||
'SubSystem': '1',
|
||||
},
|
||||
'VCMIDLTool': {
|
||||
'GenerateStublessProxies': 'true',
|
||||
|
|
Загрузка…
Ссылка в новой задаче