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

Side by Side Diff: ui/ui.gyp

Issue 10861027: Add missing Xrandr library after r152519 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | no next file » | 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 { 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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 '../build/linux/system.gyp:glib', 559 '../build/linux/system.gyp:glib',
560 '../build/linux/system.gyp:pangocairo', 560 '../build/linux/system.gyp:pangocairo',
561 '../build/linux/system.gyp:x11', 561 '../build/linux/system.gyp:x11',
562 '../build/linux/system.gyp:xext', 562 '../build/linux/system.gyp:xext',
563 '../build/linux/system.gyp:xfixes', 563 '../build/linux/system.gyp:xfixes',
564 ], 564 ],
565 'link_settings': { 565 'link_settings': {
566 'libraries': [ 566 'libraries': [
567 '-lXcursor', # For XCursor* function calls in x11_util.cc. 567 '-lXcursor', # For XCursor* function calls in x11_util.cc.
568 '-lXrender', # For XRender* function calls in x11_util.cc. 568 '-lXrender', # For XRender* function calls in x11_util.cc.
569 '-lXrandr', # For XRR* function calls in x11_util.cc.
569 ], 570 ],
570 }, 571 },
571 'conditions': [ 572 'conditions': [
572 ['toolkit_views==0', { 573 ['toolkit_views==0', {
573 # Note: because of gyp predence rules this has to be defined as 574 # Note: because of gyp predence rules this has to be defined as
574 # 'sources/' rather than 'sources!'. 575 # 'sources/' rather than 'sources!'.
575 'sources/': [ 576 'sources/': [
576 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'], 577 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
577 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'], 578 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'],
578 ['exclude', '^base/dragdrop/drag_utils.cc'], 579 ['exclude', '^base/dragdrop/drag_utils.cc'],
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 ], 778 ],
778 'conditions': [ 779 'conditions': [
779 ['inside_chromium_build == 1 and OS != "ios"', { 780 ['inside_chromium_build == 1 and OS != "ios"', {
780 # TODO(ios): The ui tests do not compile yet on iOS. 781 # TODO(ios): The ui tests do not compile yet on iOS.
781 'includes': [ 782 'includes': [
782 'ui_unittests.gypi', 783 'ui_unittests.gypi',
783 ]}, 784 ]},
784 ], 785 ],
785 ], 786 ],
786 } 787 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698