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 |
+ }, |
+ }, |
}, |
}, |
}, |