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

Side by Side Diff: build/linux/system.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 | « base/base.gyp ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, { 10 }, {
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 }, 741 },
742 'link_settings': { 742 'link_settings': {
743 'ldflags': [ 743 'ldflags': [
744 '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))' , 744 '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))' ,
745 ], 745 ],
746 'libraries': [ 746 'libraries': [
747 '<!@(pkg-config --libs-only-l <(glib_packages))', 747 '<!@(pkg-config --libs-only-l <(glib_packages))',
748 ], 748 ],
749 }, 749 },
750 }], 750 }],
751 ['chromeos==1', { 751 ['use_x11==1', {
752 'link_settings': { 752 'link_settings': {
753 'libraries': [ '-lXtst' ] 753 'libraries': [ '-lXtst' ]
754 } 754 }
755 }], 755 }],
756 ], 756 ],
757 }, 757 },
758 { 758 {
759 'target_name': 'pangocairo', 759 'target_name': 'pangocairo',
760 'type': 'none', 760 'type': 'none',
761 'toolsets': ['host', 'target'], 761 'toolsets': ['host', 'target'],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 ], 817 ],
818 'libraries': [ 818 'libraries': [
819 '<!@(<(pkg-config) --libs-only-l libudev)', 819 '<!@(<(pkg-config) --libs-only-l libudev)',
820 ], 820 ],
821 }, 821 },
822 }], 822 }],
823 ], 823 ],
824 }, 824 },
825 ], 825 ],
826 } 826 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698