mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #148 from atom/desktop-capture-api

Browse source 
Desktop capture API support
This commit is contained in:
Cheng Zhao 2015-12-08 12:40:57 +08:00
commit 4004e4836a
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
brightray/brightray.gyp
View file

@ -87,6 +87,13 @@
'<(libchromiumcontent_dir)/libdevtools_discovery.a', '<(libchromiumcontent_dir)/libdevtools_discovery.a',
'<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libdevtools_http_handler.a',
'<(libchromiumcontent_dir)/libhttp_server.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',
], ],
}, },
}, { }, {
@ -112,6 +119,7 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework', '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
'$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
], ],
}, },
'conditions': [ 'conditions': [
@ -122,6 +130,12 @@
'<(libchromiumcontent_dir)/libdevtools_discovery.a', '<(libchromiumcontent_dir)/libdevtools_discovery.a',
'<(libchromiumcontent_dir)/libdevtools_http_handler.a', '<(libchromiumcontent_dir)/libdevtools_http_handler.a',
'<(libchromiumcontent_dir)/libhttp_server.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',
], ],
}, },
}, { }, {
@ -174,6 +188,13 @@
'<(libchromiumcontent_dir)/devtools_discovery.lib', '<(libchromiumcontent_dir)/devtools_discovery.lib',
'<(libchromiumcontent_dir)/devtools_http_handler.lib', '<(libchromiumcontent_dir)/devtools_http_handler.lib',
'<(libchromiumcontent_dir)/http_server.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',
], ],
}, },
}, { }, {

10
brightray/brightray.gypi
View file

@ -162,6 +162,13 @@
'-fno-rtti', '-fno-rtti',
], ],
}], # OS=="linux" }], # 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"', { ['OS=="win"', {
'include_dirs': [ 'include_dirs': [
'<(libchromiumcontent_src_dir)/third_party/wtl/include', '<(libchromiumcontent_src_dir)/third_party/wtl/include',
@ -178,6 +185,9 @@
'WIN32_LEAN_AND_MEAN', 'WIN32_LEAN_AND_MEAN',
'_ATL_NO_OPENGL', '_ATL_NO_OPENGL',
'_SECURE_ATL', '_SECURE_ATL',
# The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h"
# is required to see this macro.
'WEBRTC_WIN',
], ],
'conditions': [ 'conditions': [
['target_arch=="x64"', { ['target_arch=="x64"', {