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: http://src.chromium.org/svn/trunk/src/build@19561 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
bradnelson@chromium.org 2009-06-30 00:02:27 +00:00
Родитель e39b304d2a
Коммит 4f9041464f
1 изменённых файлов: 17 добавлений и 8 удалений

Просмотреть файл

@ -60,6 +60,11 @@
# Once all vsprops settings are migrated into gyp, this can go away. # Once all vsprops settings are migrated into gyp, this can go away.
'msvs_use_common_release%': 1, '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. # TODO(sgk): eliminate this if possible.
# It would be nicer to support this via a setting in 'target_defaults' # It would be nicer to support this via a setting in 'target_defaults'
# in chrome/app/locales/locales.gypi overriding the setting in the # in chrome/app/locales/locales.gypi overriding the setting in the
@ -76,7 +81,7 @@
'toolkit_views%': 0, 'toolkit_views%': 0,
'linux2%': 0, 'linux2%': 0,
'chrome_personalization%': 0, 'chrome_personalization%': 0,
}, },
'target_defaults': { 'target_defaults': {
@ -483,8 +488,6 @@
['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalOptions':
'/safeseh:NO /dynamicbase:NO /ignore:4199 /ignore:4221 /nxcompat',
'AdditionalDependencies': [ 'AdditionalDependencies': [
'wininet.lib', 'wininet.lib',
'version.lib', 'version.lib',
@ -496,11 +499,6 @@
], ],
'AdditionalLibraryDirectories': 'AdditionalLibraryDirectories':
['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
'DelayLoadDLLs': [
'dbghelp.dll',
'dwmapi.dll',
'uxtheme.dll',
],
'GenerateDebugInformation': 'true', 'GenerateDebugInformation': 'true',
'MapFileName': '$(OutDir)\\$(TargetName).map', 'MapFileName': '$(OutDir)\\$(TargetName).map',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', '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': { 'scons_settings': {
'sconsbuild_dir': '<(DEPTH)/sconsbuild', 'sconsbuild_dir': '<(DEPTH)/sconsbuild',