Chromium Code Reviews| Index: chrome/installer/mini_installer.gyp |
| =================================================================== |
| --- chrome/installer/mini_installer.gyp (revision 78148) |
| +++ chrome/installer/mini_installer.gyp (working copy) |
| @@ -54,26 +54,28 @@ |
| '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. Here we pull in the 2008/vc9 crt obj files, |
|
Mark Mentovai
2011/03/16 16:25:20
Nit: don’t write “we” in comments. Who are “we,” a
RN
2011/03/17 06:33:25
Work habit. Changed.
|
| + # 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\\' |
| 'crt\\src\\intel\\mt_lib\\memset.obj"', |
| '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' |
| 'crt\\src\\intel\\mt_lib\\P4_memset.obj"', |
| - 'shlwapi.lib', |
| - 'setupapi.lib', |
| ], |
| - },{ |
| + }], |
| + ['MSVS_VERSION!="2010" and MSVS_VERSION!="2010e" and MSVS_VERSION!="2008e" and MSVS_VERSION!="2005e"', { |
| 'AdditionalDependencies': [ |
| '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', |
| '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', |
| - 'shlwapi.lib', |
| - 'setupapi.lib', |
| ], |
| }], |
| ], |