diff options
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index dac7bc1..837d4f1 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -54,11 +54,28 @@ 'IgnoreAllDefaultLibraries': 'true', 'OptimizeForWindows98': '1', 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - 'AdditionalDependencies': [ - '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', - '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', - 'shlwapi.lib', - 'setupapi.lib', + 'conditions': [ + ['MSVS_VERSION=="2010"', { + 'AdditionalDependencies': [ + # These two object files are included in Visual Studio 2008 + # but not 2010. + # 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', + ], + },{ + 'AdditionalDependencies': [ + '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', + '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', + 'shlwapi.lib', + 'setupapi.lib', + ], + }], ], }, 'VCManifestTool': { |