From 825ff8d48aee34b10ef6198743755b88c01a0e6b Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 May 2009 01:40:48 +0000
Subject: 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
---
 build/common.gypi | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'build')

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',
-- 
cgit v1.1