OLD | NEW |
---|---|
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
47 'AdditionalLibraryDirectories': [ | 47 'AdditionalLibraryDirectories': [ |
48 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', | 48 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', |
49 '<(PRODUCT_DIR)/lib' | 49 '<(PRODUCT_DIR)/lib' |
50 ], | 50 ], |
51 'DelayLoadDLLs': [], | 51 'DelayLoadDLLs': [], |
52 'EntryPointSymbol': 'MainEntryPoint', | 52 'EntryPointSymbol': 'MainEntryPoint', |
53 'GenerateMapFile': 'true', | 53 'GenerateMapFile': 'true', |
54 'IgnoreAllDefaultLibraries': 'true', | 54 'IgnoreAllDefaultLibraries': 'true', |
55 'OptimizeForWindows98': '1', | 55 'OptimizeForWindows98': '1', |
56 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 56 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
57 'AdditionalDependencies': [ | |
58 'shlwapi.lib', | |
59 'setupapi.lib', | |
60 ], | |
57 'conditions': [ | 61 'conditions': [ |
58 ['MSVS_VERSION=="2010"', { | 62 ['MSVS_VERSION=="2010"', { |
59 'AdditionalDependencies': [ | 63 'AdditionalDependencies': [ |
60 # These two object files are included in Visual Studio 2008 | 64 # These two object files are included in Visual Studio 2008 |
61 # but not 2010. | 65 # 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.
| |
66 # assuming the user has both retail 2008 and 2010 installed. | |
62 # TODO(bradnelson): | 67 # TODO(bradnelson): |
63 # http://code.google.com/p/chromium/issues/detail?id=72885 | 68 # http://code.google.com/p/chromium/issues/detail?id=72885 |
64 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' | 69 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' |
65 'crt\\src\\intel\\mt_lib\\memset.obj"', | 70 'crt\\src\\intel\\mt_lib\\memset.obj"', |
66 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' | 71 '"$(VCInstallDir)..\\..\\Microsoft Visual Studio 9.0\\VC\\' |
67 'crt\\src\\intel\\mt_lib\\P4_memset.obj"', | 72 'crt\\src\\intel\\mt_lib\\P4_memset.obj"', |
68 'shlwapi.lib', | |
69 'setupapi.lib', | |
70 ], | 73 ], |
71 },{ | 74 }], |
75 ['MSVS_VERSION!="2010" and MSVS_VERSION!="2010e" and MSVS_VERSION! ="2008e" and MSVS_VERSION!="2005e"', { | |
72 'AdditionalDependencies': [ | 76 'AdditionalDependencies': [ |
73 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', | 77 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', |
74 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', | 78 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', |
75 'shlwapi.lib', | |
76 'setupapi.lib', | |
77 ], | 79 ], |
78 }], | 80 }], |
79 ], | 81 ], |
80 }, | 82 }, |
81 'VCManifestTool': { | 83 'VCManifestTool': { |
82 'AdditionalManifestFiles': [ | 84 'AdditionalManifestFiles': [ |
83 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', | 85 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', |
84 ], | 86 ], |
85 }, | 87 }, |
86 }, | 88 }, |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
235 }, | 237 }, |
236 }], | 238 }], |
237 ], | 239 ], |
238 } | 240 } |
239 | 241 |
240 # Local Variables: | 242 # Local Variables: |
241 # tab-width:2 | 243 # tab-width:2 |
242 # indent-tabs-mode:nil | 244 # indent-tabs-mode:nil |
243 # End: | 245 # End: |
244 # vim: set expandtab tabstop=2 shiftwidth=2: | 246 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |