summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-07 00:09:30 +0000
committerfischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-07 00:09:30 +0000
commita4bb5f291b5ce8df31cdc7dcdf9dac474636a8d0 (patch)
treecce22cf19e10bf26d0affebd98e3f102562defcf
parent39d9fa5486157fb4b3ab28ae403aeaa6d651e92b (diff)
downloadwebrtc-a4bb5f291b5ce8df31cdc7dcdf9dac474636a8d0.tar.gz
video_render.gypi: clean up some libraries directives to be more specific.
R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18389004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6068 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--modules/video_render/video_render.gypi18
1 files changed, 12 insertions, 6 deletions
diff --git a/modules/video_render/video_render.gypi b/modules/video_render/video_render.gypi
index 3cb61678..71d969ba 100644
--- a/modules/video_render/video_render.gypi
+++ b/modules/video_render/video_render.gypi
@@ -88,7 +88,7 @@
'android/video_render_opengles20.cc',
],
}, {
- 'all_dependent_settings': {
+ 'link_settings': {
'libraries': [
'-lGLESv2',
],
@@ -118,6 +118,12 @@
'linux/video_x11_channel.cc',
'linux/video_x11_render.cc',
],
+ }, {
+ 'link_settings': {
+ 'libraries': [
+ '-lXext',
+ ],
+ },
}],
['OS!="mac" or include_internal_video_render==0', {
'sources!': [
@@ -214,11 +220,11 @@
],
}],
['OS=="linux"', {
- 'libraries': [
- '-lrt',
- '-lXext',
- '-lX11',
- ],
+ 'link_settings': {
+ 'libraries': [
+ '-lX11',
+ ],
+ },
}],
['OS=="mac"', {
'xcode_settings': {