diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 22:43:52 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 22:43:52 +0000 |
| commit | 8b13223964fe8f641de74a9306ecd7dec5f55bfe (patch) | |
| tree | a820da63d999b3e278397e84bbc3e316f650a41c /remoting | |
| parent | 46429fb63a7e4c754bd7ce3c50e605dd83b633bc (diff) | |
| download | chromium_src-8b13223964fe8f641de74a9306ecd7dec5f55bfe.zip chromium_src-8b13223964fe8f641de74a9306ecd7dec5f55bfe.tar.gz chromium_src-8b13223964fe8f641de74a9306ecd7dec5f55bfe.tar.bz2 | |
Enable remoting_screen_capturer target on ChromeOS
remoting_screen_capturer target will be used for WebRTC screen capturers,
so it needs to be compiled on chromeos. Also cleaned up dependencies on linux.
BUG=134249
Review URL: https://chromiumcodereview.appspot.com/11688002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index bd514a2..1da423f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -237,7 +237,7 @@ }, 'conditions': [ - ['enable_remoting_host==1', { + ['OS=="win" or OS=="mac" or OS=="linux"', { 'targets': [ { 'target_name': 'remoting_screen_capturer', @@ -285,6 +285,16 @@ 'differ_block_sse2', ], }], + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-lX11', + '-lXdamage', + '-lXext', + '-lXfixes', + ], + }, + }], ['toolkit_uses_gtk==1', { 'dependencies': [ '../build/linux/system.gyp:gtk', @@ -296,7 +306,11 @@ }], ], }, # end of target remoting_screen_capturer + ], # end of 'targets' + }], # 'OS==win or OS==mac or OS==linux' + ['enable_remoting_host==1', { + 'targets': [ { 'target_name': 'remoting_host', 'type': 'static_library', @@ -465,19 +479,6 @@ 'host/win/window_station_and_desktop.h', ], 'conditions': [ - ['OS=="linux"', { - 'link_settings': { - 'libraries': [ - '-lX11', - '-lXdamage', - '-lXfixes', - '-lpam', - '-lXtst', - '-lXext', - '-lXi' - ], - }, - }], ['toolkit_uses_gtk==1', { 'dependencies': [ '../build/linux/system.gyp:gtk', @@ -487,6 +488,18 @@ '*_gtk.cc', ], }], + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-lX11', + '-lXext', + '-lXfixes', + '-lXtst', + '-lXi', + '-lpam', + ], + }, + }], ['OS=="mac"', { 'sources': [ '../third_party/GTM/AppKit/GTMCarbonEvent.h', @@ -2157,6 +2170,7 @@ 'remoting_host', 'remoting_jingle_glue', 'remoting_protocol', + 'remoting_screen_capturer', 'remoting_host_setup_base', '../base/base.gyp:base', '../base/base.gyp:base_i18n', @@ -2319,13 +2333,12 @@ 'webapp/format_iq.js', ], }], - ['chromeos != 0', { + ['enable_remoting_host == 0', { 'dependencies!': [ 'remoting_host', 'remoting_host_setup_base', ], 'sources/': [ - ['exclude', 'capturer/*'], ['exclude', 'codec/*'], ['exclude', 'host/*'], ] |