OLD | NEW |
---|---|
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # IMPORTANT: | 5 # IMPORTANT: |
6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
8 { | 8 { |
9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
11 'variables': { | 11 'variables': { |
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1547 'VCLinkerTool': { | 1547 'VCLinkerTool': { |
1548 'AdditionalDependencies': [ | 1548 'AdditionalDependencies': [ |
1549 'wininet.lib', | 1549 'wininet.lib', |
1550 'dnsapi.lib', | 1550 'dnsapi.lib', |
1551 'version.lib', | 1551 'version.lib', |
1552 'msimg32.lib', | 1552 'msimg32.lib', |
1553 'ws2_32.lib', | 1553 'ws2_32.lib', |
1554 'usp10.lib', | 1554 'usp10.lib', |
1555 'psapi.lib', | 1555 'psapi.lib', |
1556 'dbghelp.lib', | 1556 'dbghelp.lib', |
1557 'winmm.lib', | |
1558 'shlwapi.lib', | |
rvargas (doing something else)
2011/04/26 23:10:52
I should be able to add #pragma comment(lib) when
brettw
2011/04/26 23:53:59
These are things that base depends on, though, rig
rvargas (doing something else)
2011/04/27 00:18:18
Not really. Base compiles without these because it
brettw
2011/04/27 18:11:07
Okay, makes sense.
| |
1557 ], | 1559 ], |
1558 'conditions': [ | 1560 'conditions': [ |
1559 ['msvs_express', { | 1561 ['msvs_express', { |
1560 # Explicitly required when using the ATL with express | 1562 # Explicitly required when using the ATL with express |
1561 'AdditionalDependencies': [ | 1563 'AdditionalDependencies': [ |
1562 'atlthunk.lib', | 1564 'atlthunk.lib', |
1563 ], | 1565 ], |
1564 }], | 1566 }], |
1565 ['MSVS_VERSION=="2005e"', { | 1567 ['MSVS_VERSION=="2005e"', { |
1566 # Non-express versions link automatically to these | 1568 # Non-express versions link automatically to these |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1690 # and therefore SYMROOT, needs to be set at the project level. | 1692 # and therefore SYMROOT, needs to be set at the project level. |
1691 'SYMROOT': '<(DEPTH)/xcodebuild', | 1693 'SYMROOT': '<(DEPTH)/xcodebuild', |
1692 }, | 1694 }, |
1693 } | 1695 } |
1694 | 1696 |
1695 # Local Variables: | 1697 # Local Variables: |
1696 # tab-width:2 | 1698 # tab-width:2 |
1697 # indent-tabs-mode:nil | 1699 # indent-tabs-mode:nil |
1698 # End: | 1700 # End: |
1699 # vim: set expandtab tabstop=2 shiftwidth=2: | 1701 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |