diff options
| -rw-r--r-- | build/common.gypi | 21 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 36 | ||||
| -rw-r--r-- | media/media.gyp | 5 | ||||
| -rw-r--r-- | sandbox/sandbox.gyp | 5 |
4 files changed, 66 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index c64efd7..3f247f6 100644 --- a/build/common.gypi +++ b/build/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', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3458ec2..ad9161a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -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 + }, + }, }, }, }, diff --git a/media/media.gyp b/media/media.gyp index a905b4e..df6e871 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -226,6 +226,11 @@ 'player/wtl_renderer.cc', 'player/wtl_renderer.h', ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + }, + }, }, ], }], diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp index 937f8df..b9506bb 100644 --- a/sandbox/sandbox.gyp +++ b/sandbox/sandbox.gyp @@ -283,6 +283,11 @@ '-lcomctl32.lib', ], }, + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + }, + }, 'configurations': { 'Debug': { 'msvs_precompiled_header': 'sandbox_poc/stdafx.h', |