From 64b03339646ba771869e56e4d33a66994203f8ea Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Fri, 2 Oct 2015 17:27:48 +0800 Subject: [PATCH 1/4] [OS X] Link dependent libraries for desktop capture API. --- brightray/brightray.gyp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index b3c4e92e6fde..fce3e3573cfb 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -112,6 +112,7 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, 'conditions': [ @@ -122,6 +123,12 @@ '<(libchromiumcontent_dir)/libdevtools_discovery.a', '<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libhttp_server.a', + '<(libchromiumcontent_dir)/libdesktop_capture.a', + '<(libchromiumcontent_dir)/librtc_base.a', + '<(libchromiumcontent_dir)/librtc_base_approved.a', + '<(libchromiumcontent_dir)/libsystem_wrappers.a', + '<(libchromiumcontent_dir)/libwebrtc_common.a', + '<(libchromiumcontent_dir)/libyuv.a', ], }, }, { From 59cbd0a00defd67df7107f57ed6579ec3ea49a9d Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sat, 3 Oct 2015 10:49:42 +0800 Subject: [PATCH 2/4] [Windows] Link libraries for desktop capture API. --- brightray/brightray.gyp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index fce3e3573cfb..cdc6e60907bf 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -180,6 +180,13 @@ '<(libchromiumcontent_dir)/devtools_discovery.lib', '<(libchromiumcontent_dir)/devtools_http_handler.lib', '<(libchromiumcontent_dir)/http_server.lib', + '<(libchromiumcontent_dir)/desktop_capture.lib', + '<(libchromiumcontent_dir)/desktop_capture_differ_sse2.lib', + '<(libchromiumcontent_dir)/rtc_base.lib', + '<(libchromiumcontent_dir)/rtc_base_approved.lib', + '<(libchromiumcontent_dir)/system_wrappers.lib', + '<(libchromiumcontent_dir)/webrtc_common.lib', + '<(libchromiumcontent_dir)/libyuv.lib', ], }, }, { From 63085fb0b0d02b565967201a30af947e6d37baa5 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sat, 3 Oct 2015 13:43:20 +0800 Subject: [PATCH 3/4] [Linux] Link libraries for desktop capture API. --- brightray/brightray.gyp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index cdc6e60907bf..f84ed74cda62 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -87,6 +87,13 @@ '<(libchromiumcontent_dir)/libdevtools_discovery.a', '<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libhttp_server.a', + '<(libchromiumcontent_dir)/libdesktop_capture.a', + '<(libchromiumcontent_dir)/libdesktop_capture_differ_sse2.a', + '<(libchromiumcontent_dir)/libsystem_wrappers.a', + '<(libchromiumcontent_dir)/librtc_base.a', + '<(libchromiumcontent_dir)/librtc_base_approved.a', + '<(libchromiumcontent_dir)/libwebrtc_common.a', + '<(libchromiumcontent_dir)/libyuv.a', ], }, }, { From ef9f6eb8c3f2bda1dfb0de3aeca3f407d699b2d0 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Mon, 5 Oct 2015 12:50:18 +0800 Subject: [PATCH 4/4] Define related marcos for webrtc on Windows and OS X. --- brightray/brightray.gypi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index fa442967671a..cd567485a834 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -163,6 +163,13 @@ '-fno-rtti', ], }], # OS=="linux" + ['OS=="mac"', { + 'defines': [ + # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h" + # is required to see this macro. + 'WEBRTC_MAC', + ], + }], # OS=="mac" ['OS=="win"', { 'include_dirs': [ '<(libchromiumcontent_src_dir)/third_party/wtl/include', @@ -179,6 +186,9 @@ 'WIN32_LEAN_AND_MEAN', '_ATL_NO_OPENGL', '_SECURE_ATL', + # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h" + # is required to see this macro. + 'WEBRTC_WIN', ], 'conditions': [ ['target_arch=="x64"', {