Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: chrome/installer/mini_installer.gyp

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Take out atlcheck; VC2005e compat Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/gcapi/gcapi_test.rc ('k') | chrome/installer/mini_installer/mini_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gyp
===================================================================
--- chrome/installer/mini_installer.gyp (revision 78845)
+++ chrome/installer/mini_installer.gyp (working copy)
@@ -58,23 +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.
- # 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"',
+ ['MSVS_VERSION=="2005e"', {
+ 'AdditionalDependencies': [ # Must explicitly link in VC2005E
+ 'advapi32.lib',
+ 'shell32.lib',
],
- },{
- 'AdditionalDependencies': [
- '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
- '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
- ],
}],
],
},
« no previous file with comments | « chrome/installer/gcapi/gcapi_test.rc ('k') | chrome/installer/mini_installer/mini_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698