From b1eb43142e7bbc47f4146dc7a0fd792e94300e62 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Wed, 7 May 2014 00:09:30 +0000 Subject: [PATCH] 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@6068 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_render/video_render.gypi | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 3cb6167834..71d969baba 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/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': {