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

Side by Side Diff: ui/views/views.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « ui/ui.gyp ('k') | webkit/common/webkit_common.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 ['OS=="win"', { 559 ['OS=="win"', {
560 'dependencies': [ 560 'dependencies': [
561 # For accessibility 561 # For accessibility
562 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 562 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
563 ], 563 ],
564 'include_dirs': [ 564 'include_dirs': [
565 '../../third_party/wtl/include', 565 '../../third_party/wtl/include',
566 ], 566 ],
567 'link_settings': { 567 'link_settings': {
568 'libraries': [ 568 'libraries': [
569 '-ldwmapi.lib',
569 '-limm32.lib', 570 '-limm32.lib',
570 '-loleacc.lib', 571 '-loleacc.lib',
571 ], 572 ],
572 'msvs_settings': { 573 'msvs_settings': {
573 'VCLinkerTool': { 574 'VCLinkerTool': {
574 'DelayLoadDLLs': [ 575 'DelayLoadDLLs': [
575 'user32.dll', 576 'user32.dll',
576 ], 577 ],
577 }, 578 },
578 }, 579 },
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 'sources/': [ 1088 'sources/': [
1088 # This is needed because the aura rule strips it from the default 1089 # This is needed because the aura rule strips it from the default
1089 # sources list. 1090 # sources list.
1090 ['include', '^../../content/app/startup_helper_win.cc'], 1091 ['include', '^../../content/app/startup_helper_win.cc'],
1091 ], 1092 ],
1092 }], 1093 }],
1093 ], 1094 ],
1094 }, # target_name: views_examples_with_content_exe 1095 }, # target_name: views_examples_with_content_exe
1095 ], 1096 ],
1096 } 1097 }
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | webkit/common/webkit_common.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698