| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'ui_resources.gypi', | 10 'ui_resources.gypi', |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 ], | 625 ], |
| 626 'include_dirs': [ | 626 'include_dirs': [ |
| 627 '../', | 627 '../', |
| 628 '../third_party/wtl/include', | 628 '../third_party/wtl/include', |
| 629 ], | 629 ], |
| 630 'msvs_settings': { | 630 'msvs_settings': { |
| 631 'VCLinkerTool': { | 631 'VCLinkerTool': { |
| 632 'DelayLoadDLLs': [ | 632 'DelayLoadDLLs': [ |
| 633 'd2d1.dll', | 633 'd2d1.dll', |
| 634 'd3d10_1.dll', | 634 'd3d10_1.dll', |
| 635 'dwmapi.dll', |
| 635 ], | 636 ], |
| 636 'AdditionalDependencies': [ | 637 'AdditionalDependencies': [ |
| 637 'd2d1.lib', | 638 'd2d1.lib', |
| 638 'd3d10_1.lib', | 639 'd3d10_1.lib', |
| 640 'dwmapi.lib', |
| 639 ], | 641 ], |
| 640 }, | 642 }, |
| 641 }, | 643 }, |
| 642 'link_settings': { | 644 'link_settings': { |
| 643 'libraries': [ | 645 'libraries': [ |
| 644 '-limm32.lib', | 646 '-limm32.lib', |
| 645 '-ld2d1.lib', | 647 '-ld2d1.lib', |
| 648 '-ldwmapi.lib', |
| 646 '-loleacc.lib', | 649 '-loleacc.lib', |
| 647 ], | 650 ], |
| 648 }, | 651 }, |
| 649 },{ # OS!="win" | 652 },{ # OS!="win" |
| 650 'conditions': [ | 653 'conditions': [ |
| 651 ['use_aura==0', { | 654 ['use_aura==0', { |
| 652 'sources!': [ | 655 'sources!': [ |
| 653 'base/view_prop.cc', | 656 'base/view_prop.cc', |
| 654 'base/view_prop.h', | 657 'base/view_prop.h', |
| 655 ], | 658 ], |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 ], | 770 ], |
| 768 'conditions': [ | 771 'conditions': [ |
| 769 ['inside_chromium_build == 1 and OS != "ios"', { | 772 ['inside_chromium_build == 1 and OS != "ios"', { |
| 770 # TODO(ios): The ui tests do not compile yet on iOS. | 773 # TODO(ios): The ui tests do not compile yet on iOS. |
| 771 'includes': [ | 774 'includes': [ |
| 772 'ui_unittests.gypi', | 775 'ui_unittests.gypi', |
| 773 ]}, | 776 ]}, |
| 774 ], | 777 ], |
| 775 ], | 778 ], |
| 776 } | 779 } |
| OLD | NEW |