Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: build/common.gypi

Issue 149152: Modifying mini_installer to have different additional options.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 19853)
+++ 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
@@ -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',
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698