0

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: svn://svn.chromium.org/chrome/trunk/src@16698 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
sgk@google.com
2009-05-22 01:40:48 +00:00
parent 973ef14dea
commit 825ff8d48a
4 changed files with 66 additions and 1 deletions

@ -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',

@ -2129,6 +2129,8 @@
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
# Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
'SubSystem': '2',
},
},
},{ # 'OS!="win"
@ -2985,6 +2987,15 @@
'dependencies': [
'../views/views.gyp:views',
],
'configurations': {
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
},
},
},
},
}, { # else: OS != "win"
'sources!': [
'browser/bookmarks/bookmark_codec_unittest.cc',
@ -3239,6 +3250,15 @@
],
}],
],
'configurations': {
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
},
},
},
},
},
],
}], # OS!="mac"
@ -3335,6 +3355,17 @@
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
# Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
'SubSystem': '2',
},
},
'configurations': {
'Debug': {
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
},
},
},
},
},
@ -3377,6 +3408,11 @@
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
},
},
},
},
},

@ -226,6 +226,11 @@
'player/wtl_renderer.cc',
'player/wtl_renderer.h',
],
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
},
},
},
],
}],

@ -283,6 +283,11 @@
'-lcomctl32.lib',
],
},
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
},
},
'configurations': {
'Debug': {
'msvs_precompiled_header': 'sandbox_poc/stdafx.h',