Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 19480) |
+++ build/common.gypi (working copy) |
@@ -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 |
@@ -76,7 +81,7 @@ |
'toolkit_views%': 0, |
'linux2%': 0, |
- |
+ |
'chrome_personalization%': 0, |
}, |
'target_defaults': { |
@@ -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', |
@@ -537,6 +535,17 @@ |
'external_code.gypi', |
], |
}], |
+ ['msvs_use_common_linker_extras', { |
+ 'VCLinkerTool': { |
+ 'AdditionalOptions': |
+ '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat', |
sgk
2009/07/06 16:25:07
The section above that it looks like this is inten
|
+ 'DelayLoadDLLs': [ |
+ 'dbghelp.dll', |
+ 'dwmapi.dll', |
+ 'uxtheme.dll', |
+ ], |
+ }, |
+ }], |
], |
'scons_settings': { |
'sconsbuild_dir': '<(DEPTH)/sconsbuild', |