Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: webrtc/modules/video_capture/video_capture.gypi

Issue 2375273004: Reland of Unify the macOS and iOS capturer implementations (Closed)
Patch Set: fix gyp build Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/video_capture/objc/video_capture.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_capture/video_capture.gypi
diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index eb101478fe403c64cb8b1bf1e5c493284aac8dda..9027706beb0f247807db8fcd101f35ffe464b67e 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -68,29 +68,6 @@
'linux/video_capture_linux.h',
],
}], # linux
- ['OS=="mac"', {
- 'sources': [
- 'mac/qtkit/video_capture_qtkit.h',
- 'mac/qtkit/video_capture_qtkit.mm',
- 'mac/qtkit/video_capture_qtkit_info.h',
- 'mac/qtkit/video_capture_qtkit_info.mm',
- 'mac/qtkit/video_capture_qtkit_info_objc.h',
- 'mac/qtkit/video_capture_qtkit_info_objc.mm',
- 'mac/qtkit/video_capture_qtkit_objc.h',
- 'mac/qtkit/video_capture_qtkit_objc.mm',
- 'mac/qtkit/video_capture_qtkit_utility.h',
- 'mac/video_capture_mac.mm',
- ],
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework Cocoa',
- '-framework CoreVideo',
- '-framework QTKit',
- ],
- },
- },
- }], # mac
['OS=="win"', {
'dependencies': [
'<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses',
@@ -133,16 +110,16 @@
},
},
}],
- ['OS=="ios"', {
+ ['OS=="ios" or OS=="mac"', {
'sources': [
- 'ios/device_info_ios.h',
- 'ios/device_info_ios.mm',
- 'ios/device_info_ios_objc.h',
- 'ios/device_info_ios_objc.mm',
- 'ios/rtc_video_capture_ios_objc.h',
- 'ios/rtc_video_capture_ios_objc.mm',
- 'ios/video_capture_ios.h',
- 'ios/video_capture_ios.mm',
+ 'objc/device_info.h',
+ 'objc/device_info.mm',
+ 'objc/device_info_objc.h',
+ 'objc/device_info_objc.mm',
+ 'objc/rtc_video_capture_objc.h',
+ 'objc/rtc_video_capture_objc.mm',
+ 'objc/video_capture.h',
+ 'objc/video_capture.mm',
],
'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES',
@@ -153,6 +130,14 @@
'-framework AVFoundation',
'-framework CoreMedia',
'-framework CoreVideo',
+ ],
+ },
+ },
+ }], # ios
+ ['OS=="ios"', {
+ 'all_dependent_settings': {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
'-framework UIKit',
],
},
« no previous file with comments | « webrtc/modules/video_capture/objc/video_capture.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698