Modifying mini_installer to have different additional options.
This should not affect other targets.
BUG=None
TEST=None
TBR=sgk
Review URL: http://codereview.chromium.org/149152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19916 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index df71555..ed5992f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -60,6 +60,11 @@
# Once all vsprops settings are migrated into gyp, this can go away.
'msvs_use_common_release%': 1,
+ # TODO(bradnelson): eliminate this when possible.
+ # To allow local gyp files to override additional linker options for msvs.
+ # Yes(1) means set use the common linker options.
+ 'msvs_use_common_linker_extras%': 1,
+
# TODO(sgk): eliminate this if possible.
# It would be nicer to support this via a setting in 'target_defaults'
# in chrome/app/locales/locales.gypi overriding the setting in the
@@ -483,8 +488,6 @@
['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
},
'VCLinkerTool': {
- 'AdditionalOptions':
- '/safeseh:NO /dynamicbase:NO /ignore:4199 /ignore:4221 /nxcompat',
'AdditionalDependencies': [
'wininet.lib',
'version.lib',
@@ -496,11 +499,6 @@
],
'AdditionalLibraryDirectories':
['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
- 'DelayLoadDLLs': [
- 'dbghelp.dll',
- 'dwmapi.dll',
- 'uxtheme.dll',
- ],
'GenerateDebugInformation': 'true',
'MapFileName': '$(OutDir)\\$(TargetName).map',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
@@ -545,6 +543,21 @@
],
},
}],
+ ['msvs_use_common_linker_extras', {
+ 'target_defaults': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalOptions':
+ '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+ 'DelayLoadDLLs': [
+ 'dbghelp.dll',
+ 'dwmapi.dll',
+ 'uxtheme.dll',
+ ],
+ },
+ },
+ },
+ }],
],
'scons_settings': {
'sconsbuild_dir': '<(DEPTH)/sconsbuild',
