media/media.gyp - Issue 12563002: x11: Include X11 dependencies only when building with X11.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.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:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 7bfee3d21607beaf27fcb51783f1c04fad5c2270..068fc2f670b6f72333eab8763b4709a567f7039e 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -595,15 +595,17 @@

}],

- 'link_settings': {

- 'libraries': [

- '-lX11',

- '-lXdamage',

- '-lXext',

- '-lXfixes',

- ],

- },

'conditions': [

+ ['use_x11 == 1', {

+ 'link_settings': {

+ 'libraries': [

+ '-lX11',

+ '-lXdamage',

+ '-lXext',

+ '-lXfixes',

+ ],

+ },

+ }],

['use_cras == 1', {

'cflags': [

'<!@(<(pkg-config) --cflags libcras)',

@@ -1345,7 +1347,7 @@

}],

- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {

+ ['use_x11 == 1', {

'targets': [

{

'target_name': 'player_x11',