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

Unified Diff: chrome/chrome.gyp

Issue 115664: Explicitly enable /INCREMENTAL linking for gyp-generated Debug builds,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 16681)
+++ chrome/chrome.gyp (working copy)
@@ -2127,6 +2127,8 @@
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
+ # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
+ 'SubSystem': '2',
},
},
},{ # 'OS!="win"
@@ -2983,6 +2985,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',
@@ -3237,6 +3248,15 @@
],
}],
],
+ 'configurations': {
+ 'Debug': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'LinkIncremental': '1', # /INCREMENTAL:NO
+ },
+ },
+ },
+ },
},
],
}], # OS!="mac"
@@ -3333,8 +3353,19 @@
'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
+ },
+ },
+ },
+ },
},
{
'target_name': 'interactive_ui_tests',
@@ -3375,6 +3406,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
+ },
+ },
},
},
},
« no previous file with comments | « build/common.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698