| Index: webrtc/api/api.gyp
|
| diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
|
| index ec51b4772819758fd92c5cdc8836c5852d74a9e8..8bace18281a33befcd15219c5da47007dc7848a3 100644
|
| --- a/webrtc/api/api.gyp
|
| +++ b/webrtc/api/api.gyp
|
| @@ -9,19 +9,17 @@
|
| {
|
| 'includes': [ '../build/common.gypi', ],
|
| 'conditions': [
|
| - ['OS=="ios"', {
|
| + ['OS=="ios" or OS=="mac"', {
|
| 'targets': [
|
| {
|
| 'target_name': 'rtc_api_objc',
|
| 'type': 'static_library',
|
| + 'includes': [ '../build/objc_common.gypi' ],
|
| 'dependencies': [
|
| '<(webrtc_root)/base/base.gyp:rtc_base_objc',
|
| '../../talk/libjingle.gyp:libjingle_peerconnection',
|
| ],
|
| 'sources': [
|
| - 'objc/RTCAVFoundationVideoSource+Private.h',
|
| - 'objc/RTCAVFoundationVideoSource.h',
|
| - 'objc/RTCAVFoundationVideoSource.mm',
|
| 'objc/RTCAudioTrack+Private.h',
|
| 'objc/RTCAudioTrack.h',
|
| 'objc/RTCAudioTrack.mm',
|
| @@ -73,14 +71,17 @@
|
| 'objc/RTCVideoTrack+Private.h',
|
| 'objc/RTCVideoTrack.h',
|
| 'objc/RTCVideoTrack.mm',
|
| - 'objc/avfoundationvideocapturer.h',
|
| - 'objc/avfoundationvideocapturer.mm',
|
| ],
|
| 'conditions': [
|
| ['OS=="ios"', {
|
| 'sources': [
|
| + 'objc/RTCAVFoundationVideoSource+Private.h',
|
| + 'objc/RTCAVFoundationVideoSource.h',
|
| + 'objc/RTCAVFoundationVideoSource.mm',
|
| 'objc/RTCEAGLVideoView.h',
|
| 'objc/RTCEAGLVideoView.m',
|
| + 'objc/avfoundationvideocapturer.h',
|
| + 'objc/avfoundationvideocapturer.mm',
|
| ],
|
| 'all_dependent_settings': {
|
| 'xcode_settings': {
|
| @@ -100,11 +101,6 @@
|
| ],
|
| }],
|
| ],
|
| - 'xcode_settings': {
|
| - 'CLANG_ENABLE_OBJC_ARC': 'YES',
|
| - 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
|
| - 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
|
| - },
|
| }
|
| ],
|
| }], # OS=="ios"
|
|
|