| Index: chrome/installer/mini_installer.gyp
|
| ===================================================================
|
| --- chrome/installer/mini_installer.gyp (revision 78499)
|
| +++ chrome/installer/mini_installer.gyp (working copy)
|
| @@ -58,11 +58,16 @@
|
| 'IgnoreAllDefaultLibraries': 'true',
|
| 'OptimizeForWindows98': '1',
|
| 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
|
| + 'AdditionalDependencies': [
|
| + 'shlwapi.lib',
|
| + 'setupapi.lib',
|
| + ],
|
| 'conditions': [
|
| ['MSVS_VERSION=="2010"', {
|
| 'AdditionalDependencies': [
|
| # These two object files are included in Visual Studio 2008
|
| - # but not 2010.
|
| + # but not 2010. This pulls in the 2008/vc9 crt obj files,
|
| + # assuming the user has both retail 2008 and 2010 installed.
|
| # TODO(bradnelson):
|
| # http://code.google.com/p/chromium/issues/detail?id=72885
|
| '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
|
| @@ -70,7 +75,8 @@
|
| '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
|
| 'crt\\src\\intel\\mt_lib\\P4_memset.obj"',
|
| ],
|
| - },{
|
| + }],
|
| + ['MSVS_VERSION!="2010" and msvs_express==0', {
|
| 'AdditionalDependencies': [
|
| '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
|
| '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
|
|
|