diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 00:02:27 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 00:02:27 +0000 |
| commit | 397fe9d4394b75224aa8123850f5d1977b9c5123 (patch) | |
| tree | fa8b383aa714438dfd92b8502f0681f74109de48 /build | |
| parent | 9fa82bb8872a34275f3e0832f33339a4d07fa33b (diff) | |
| download | chromium_src-397fe9d4394b75224aa8123850f5d1977b9c5123.zip chromium_src-397fe9d4394b75224aa8123850f5d1977b9c5123.tar.gz chromium_src-397fe9d4394b75224aa8123850f5d1977b9c5123.tar.bz2 | |
Learned that mini_installer's linker settings cannot actually be shared
by everyone else.
Separated mini_installer into its own gyp file and isolated it from
several common settings.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/150045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1da2034..3005391 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 @@ -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', @@ -545,6 +543,17 @@ ], }, }], + ['msvs_use_common_linker_extras', { + 'VCLinkerTool': { + 'AdditionalOptions': + '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat', + 'DelayLoadDLLs': [ + 'dbghelp.dll', + 'dwmapi.dll', + 'uxtheme.dll', + ], + }, + }], ], 'scons_settings': { 'sconsbuild_dir': '<(DEPTH)/sconsbuild', |