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

Side by Side Diff: media/media.gyp

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback, try to fix cros_x86 gyp error Created 6 years, 10 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 | « media/cast/cast.gyp ('k') | remoting/remoting_host.gypi » ('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 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 'conditions': [ 631 'conditions': [
632 ['sysroot!=""', { 632 ['sysroot!=""', {
633 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)"', 633 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "< (target_arch)"',
634 }, { 634 }, {
635 'pkg-config': 'pkg-config' 635 'pkg-config': 'pkg-config'
636 }], 636 }],
637 ], 637 ],
638 }, 638 },
639 'conditions': [ 639 'conditions': [
640 ['use_x11==1', { 640 ['use_x11==1', {
641 'link_settings': { 641 'dependencies': [
642 'libraries': [ 642 '../build/linux/system.gyp:x11',
643 '-lX11', 643 '../build/linux/system.gyp:xdamage',
644 '-lXdamage', 644 '../build/linux/system.gyp:xext',
645 '-lXext', 645 '../build/linux/system.gyp:xfixes',
646 '-lXfixes', 646 '../build/linux/system.gyp:xtst',
647 '-lXtst', 647 ],
648 ],
649 },
650 }, { # else: use_x11==0 648 }, { # else: use_x11==0
651 'sources!': [ 649 'sources!': [
652 'base/user_input_monitor_linux.cc', 650 'base/user_input_monitor_linux.cc',
653 ], 651 ],
654 'defines': [ 652 'defines': [
655 'DISABLE_USER_INPUT_MONITOR', 653 'DISABLE_USER_INPUT_MONITOR',
656 ], 654 ],
657 }], 655 }],
658 ['use_cras==1', { 656 ['use_cras==1', {
659 'cflags': [ 657 'cflags': [
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 'targets': [ 1435 'targets': [
1438 { 1436 {
1439 'target_name': 'player_x11', 1437 'target_name': 'player_x11',
1440 'type': 'executable', 1438 'type': 'executable',
1441 'dependencies': [ 1439 'dependencies': [
1442 'media', 1440 'media',
1443 '../base/base.gyp:base', 1441 '../base/base.gyp:base',
1444 '../ui/gl/gl.gyp:gl', 1442 '../ui/gl/gl.gyp:gl',
1445 '../ui/gfx/gfx.gyp:gfx', 1443 '../ui/gfx/gfx.gyp:gfx',
1446 '../ui/gfx/gfx.gyp:gfx_geometry', 1444 '../ui/gfx/gfx.gyp:gfx_geometry',
1445 '../build/linux/system.gyp:x11',
1446 '../build/linux/system.gyp:xext',
1447 '../build/linux/system.gyp:xrender',
1447 ], 1448 ],
1448 'link_settings': {
1449 'libraries': [
1450 '-lX11',
1451 '-lXrender',
1452 '-lXext',
1453 ],
1454 },
1455 'conditions': [ 1449 'conditions': [
1456 # Linux/Solaris need libdl for dlopen() and friends. 1450 # Linux/Solaris need libdl for dlopen() and friends.
1457 ['OS=="linux" or OS=="solaris"', { 1451 ['OS=="linux" or OS=="solaris"', {
1458 'link_settings': { 1452 'link_settings': {
1459 'libraries': [ 1453 'libraries': [
1460 '-ldl', 1454 '-ldl',
1461 ], 1455 ],
1462 }, 1456 },
1463 }], 1457 }],
1464 ], 1458 ],
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 ], 1662 ],
1669 }], 1663 }],
1670 ], 1664 ],
1671 }], 1665 }],
1672 ], 1666 ],
1673 }, 1667 },
1674 ], 1668 ],
1675 }], 1669 }],
1676 ], 1670 ],
1677 } 1671 }
OLDNEW
« no previous file with comments | « media/cast/cast.gyp ('k') | remoting/remoting_host.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698