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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'AdditionalLibraryDirectories': [ 51 'AdditionalLibraryDirectories': [
52 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 52 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
53 '<(PRODUCT_DIR)/lib' 53 '<(PRODUCT_DIR)/lib'
54 ], 54 ],
55 'DelayLoadDLLs': [], 55 'DelayLoadDLLs': [],
56 'EntryPointSymbol': 'MainEntryPoint', 56 'EntryPointSymbol': 'MainEntryPoint',
57 'GenerateMapFile': 'true', 57 'GenerateMapFile': 'true',
58 'IgnoreAllDefaultLibraries': 'true', 58 'IgnoreAllDefaultLibraries': 'true',
59 'OptimizeForWindows98': '1', 59 'OptimizeForWindows98': '1',
60 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 60 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
61 'AdditionalDependencies': [
62 'shlwapi.lib',
63 'setupapi.lib',
64 ],
61 'conditions': [ 65 'conditions': [
62 ['MSVS_VERSION=="2010"', { 66 ['MSVS_VERSION=="2005e"', {
63 'AdditionalDependencies': [ 67 'AdditionalDependencies': [ # Must explicitly link in VC2005E
64 # These two object files are included in Visual Studio 2008 68 'advapi32.lib',
65 # but not 2010. 69 'shell32.lib',
66 # TODO(bradnelson):
67 # http://code.google.com/p/chromium/issues/detail?id=72885
68 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
69 'crt\\src\\intel\\mt_lib\\memset.obj"',
70 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\'
71 'crt\\src\\intel\\mt_lib\\P4_memset.obj"',
72 ],
73 },{
74 'AdditionalDependencies': [
75 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
76 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
77 ], 70 ],
78 }], 71 }],
79 ], 72 ],
80 }, 73 },
81 'VCManifestTool': { 74 'VCManifestTool': {
82 'AdditionalManifestFiles': [ 75 'AdditionalManifestFiles': [
83 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', 76 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
84 ], 77 ],
85 }, 78 },
86 }, 79 },
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 }, 228 },
236 }], 229 }],
237 ], 230 ],
238 } 231 }
239 232
240 # Local Variables: 233 # Local Variables:
241 # tab-width:2 234 # tab-width:2
242 # indent-tabs-mode:nil 235 # indent-tabs-mode:nil
243 # End: 236 # End:
244 # vim: set expandtab tabstop=2 shiftwidth=2: 237 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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