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

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_plugin.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 7bfee3d21607beaf27fcb51783f1c04fad5c2270..6ec3002c872b7b35a04625611c9896435463d1a1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -19,8 +19,8 @@
'media_use_ffmpeg%': 1,
'media_use_libvpx%': 1,
}],
- # Screen capturer works only on Windows, OSX and Linux.
- ['OS=="win" or OS=="mac" or OS=="linux"', {
+ # Screen capturer works only on Windows, OSX and Linux (with X11).
+ ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
'screen_capture_supported%': 1,
}, {
'screen_capture_supported%': 0,
@@ -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',
« no previous file with comments | « content/content_plugin.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698