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

Unified 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, 11 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 | « media/cast/cast.gyp ('k') | remoting/remoting_host.gypi » ('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 379338699293c2e23837e88bb1c6aa53bffda4be..da10ac45e9737a85954ddae9784abf038e45415d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -638,15 +638,13 @@
},
'conditions': [
['use_x11==1', {
- 'link_settings': {
- 'libraries': [
- '-lX11',
- '-lXdamage',
- '-lXext',
- '-lXfixes',
- '-lXtst',
- ],
- },
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
+ '../build/linux/system.gyp:xdamage',
+ '../build/linux/system.gyp:xext',
+ '../build/linux/system.gyp:xfixes',
+ '../build/linux/system.gyp:xtst',
+ ],
}, { # else: use_x11==0
'sources!': [
'base/user_input_monitor_linux.cc',
@@ -1444,14 +1442,10 @@
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
+ '../build/linux/system.gyp:x11',
+ '../build/linux/system.gyp:xext',
+ '../build/linux/system.gyp:xrender',
],
- 'link_settings': {
- 'libraries': [
- '-lX11',
- '-lXrender',
- '-lXext',
- ],
- },
'conditions': [
# Linux/Solaris need libdl for dlopen() and friends.
['OS=="linux" or OS=="solaris"', {
« 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