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

Side by Side Diff: ui/ui.gyp

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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 | « ui/aura/aura.gyp ('k') | 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 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 'sources/': [ 608 'sources/': [
609 ['exclude', '^base/gestures/*'], 609 ['exclude', '^base/gestures/*'],
610 ] 610 ]
611 }], 611 }],
612 ['use_glib == 1', { 612 ['use_glib == 1', {
613 'dependencies': [ 613 'dependencies': [
614 # font_gtk.cc uses fontconfig. 614 # font_gtk.cc uses fontconfig.
615 '../build/linux/system.gyp:fontconfig', 615 '../build/linux/system.gyp:fontconfig',
616 '../build/linux/system.gyp:glib', 616 '../build/linux/system.gyp:glib',
617 '../build/linux/system.gyp:pangocairo', 617 '../build/linux/system.gyp:pangocairo',
618 '../build/linux/system.gyp:x11',
619 '../build/linux/system.gyp:xext',
620 '../build/linux/system.gyp:xfixes',
621 ], 618 ],
622 'link_settings': {
623 'libraries': [
624 '-lXcursor', # For XCursor* function calls in x11_util.cc.
625 '-lXrender', # For XRender* function calls in x11_util.cc.
626 '-lXrandr', # For XRR* function calls in x11_util.cc.
627 ],
628 },
629 'conditions': [ 619 'conditions': [
630 ['toolkit_views==0', { 620 ['toolkit_views==0', {
631 # Note: because of gyp predence rules this has to be defined as 621 # Note: because of gyp predence rules this has to be defined as
632 # 'sources/' rather than 'sources!'. 622 # 'sources/' rather than 'sources!'.
633 'sources/': [ 623 'sources/': [
634 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'], 624 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
635 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'], 625 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'],
636 ['exclude', '^base/dragdrop/drag_utils.cc'], 626 ['exclude', '^base/dragdrop/drag_utils.cc'],
637 ['exclude', '^base/dragdrop/drag_utils.h'], 627 ['exclude', '^base/dragdrop/drag_utils.h'],
638 ['exclude', '^base/dragdrop/os_exchange_data.cc'], 628 ['exclude', '^base/dragdrop/os_exchange_data.cc'],
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 ['use_x11==1', { 752 ['use_x11==1', {
763 'all_dependent_settings': { 753 'all_dependent_settings': {
764 'ldflags': [ 754 'ldflags': [
765 '-L<(PRODUCT_DIR)', 755 '-L<(PRODUCT_DIR)',
766 ], 756 ],
767 'link_settings': { 757 'link_settings': {
768 'libraries': [ 758 'libraries': [
769 '-lX11', 759 '-lX11',
770 '-lXcursor', 760 '-lXcursor',
771 '-lXrandr', # For XRR* function calls in x11_util.cc. 761 '-lXrandr', # For XRR* function calls in x11_util.cc.
762 '-lXrender', # For XRender* function calls in x11_util.cc.
772 ], 763 ],
773 }, 764 },
774 }, 765 },
766 'link_settings': {
767 'libraries': [
768 '-lX11',
769 '-lXcursor',
770 '-lXrandr', # For XRR* function calls in x11_util.cc.
771 '-lXrender', # For XRender* function calls in x11_util.cc.
772 ],
773 },
774 'dependencies': [
775 '../build/linux/system.gyp:x11',
776 '../build/linux/system.gyp:xext',
777 '../build/linux/system.gyp:xfixes',
778 ],
775 }, { # use_x11==0 779 }, { # use_x11==0
776 'sources/': [ 780 'sources/': [
777 ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'], 781 ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'],
778 ['exclude', 'base/x/*'], 782 ['exclude', 'base/x/*'],
779 ], 783 ],
780 }], 784 }],
781 ['toolkit_views==0', { 785 ['toolkit_views==0', {
782 'sources!': [ 786 'sources!': [
783 'base/events/event.cc', 787 'base/events/event.cc',
784 'base/events/event.h', 788 'base/events/event.h',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 'link_settings': { 933 'link_settings': {
930 'libraries': [ 934 'libraries': [
931 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 935 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
932 ], 936 ],
933 }, 937 },
934 }, 938 },
935 ], 939 ],
936 }], 940 }],
937 ], 941 ],
938 } 942 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698