Index: webrtc/modules/desktop_capture/BUILD.gn |
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn |
index 59c317942d2d2fd44a088343d001347bb8085a40..73dcb9a4502540d43f073d44e269f383ed4f5933 100644 |
--- a/webrtc/modules/desktop_capture/BUILD.gn |
+++ b/webrtc/modules/desktop_capture/BUILD.gn |
@@ -101,6 +101,9 @@ if (rtc_include_tests) { |
"../../test:test_support", |
"//testing/gmock", |
] |
+ if (is_mac) { |
+ deps += [ ":objc_desktop_capture" ] |
+ } |
if (rtc_desktop_capture_supported) { |
sources += [ |
"screen_capturer_helper_unittest.cc", |
@@ -163,6 +166,21 @@ if (rtc_include_tests) { |
} |
} |
+if (is_mac) { |
+ rtc_source_set("objc_desktop_capture") { |
kjellander_webrtc
2017/08/14 04:36:26
We seem to have a mix of prefixed objc_ targets an
mbonadei
2017/08/15 14:55:39
Done.
|
+ check_includes = false |
kjellander_webrtc
2017/08/14 04:36:26
Please include a comment referencing a bug trackin
mbonadei
2017/08/15 14:55:39
In ps#2 we have removed the circular dependency.
|
+ sources = [ |
+ "mac/desktop_configuration.h", |
+ "mac/desktop_configuration.mm", |
+ "mouse_cursor_monitor_mac.mm", |
+ "screen_capturer_mac.mm", |
+ "window_capturer_mac.mm", |
+ ] |
+ |
+ # deps = [ ":desktop_capture" ] |
Sergey Ulanov
2017/08/14 17:53:18
Remove this?
mbonadei
2017/08/15 14:55:39
Done.
|
+ } |
+} |
+ |
rtc_static_library("desktop_capture") { |
sources = [ |
"blank_detector_desktop_capturer_wrapper.cc", |
@@ -188,8 +206,6 @@ rtc_static_library("desktop_capture") { |
"differ_block.h", |
"fallback_desktop_capturer_wrapper.cc", |
"fallback_desktop_capturer_wrapper.h", |
- "mac/desktop_configuration.h", |
- "mac/desktop_configuration.mm", |
"mac/desktop_configuration_monitor.cc", |
"mac/desktop_configuration_monitor.h", |
"mac/full_screen_chrome_window_detector.cc", |
@@ -201,7 +217,6 @@ rtc_static_library("desktop_capture") { |
"mouse_cursor.cc", |
"mouse_cursor.h", |
"mouse_cursor_monitor.h", |
- "mouse_cursor_monitor_mac.mm", |
"mouse_cursor_monitor_win.cc", |
"resolution_change_detector.cc", |
"resolution_change_detector.h", |
@@ -210,7 +225,6 @@ rtc_static_library("desktop_capture") { |
"screen_capture_frame_queue.h", |
"screen_capturer_helper.cc", |
"screen_capturer_helper.h", |
- "screen_capturer_mac.mm", |
"screen_capturer_win.cc", |
"win/cursor.cc", |
"win/cursor.h", |
@@ -249,7 +263,6 @@ rtc_static_library("desktop_capture") { |
"win/screen_capturer_win_magnifier.h", |
"win/window_capture_utils.cc", |
"win/window_capture_utils.h", |
- "window_capturer_mac.mm", |
"window_capturer_win.cc", |
] |
@@ -276,14 +289,6 @@ rtc_static_library("desktop_capture") { |
] |
} |
- if (is_mac) { |
- libs = [ |
- "AppKit.framework", |
- "IOKit.framework", |
- "OpenGL.framework", |
- ] |
- } |
- |
if (is_win) { |
libs = [ |
"d3d11.lib", |
@@ -299,6 +304,15 @@ rtc_static_library("desktop_capture") { |
"//third_party/libyuv", |
] |
+ if (is_mac) { |
+ deps += [ ":objc_desktop_capture" ] |
+ libs = [ |
Sergey Ulanov
2017/08/14 17:53:18
maybe move this to objc_desktop_capture?
mbonadei
2017/08/15 14:55:39
Done.
|
+ "AppKit.framework", |
+ "IOKit.framework", |
+ "OpenGL.framework", |
+ ] |
+ } |
+ |
if (use_desktop_capture_differ_sse2) { |
deps += [ ":desktop_capture_differ_sse2" ] |
} |