| Index: webrtc/api/api.gyp
|
| diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
|
| index 34a75f60f5eb6820193c7a6f2a087ea6ef16c7c6..5afd8f05c6e106c941fda05050976ebc6b2a0678 100644
|
| --- a/webrtc/api/api.gyp
|
| +++ b/webrtc/api/api.gyp
|
| @@ -134,19 +134,17 @@
|
| }, # libjingle_peerconnection_java
|
| ]
|
| }],
|
| - ['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',
|
| 'libjingle_peerconnection',
|
| ],
|
| 'sources': [
|
| - 'objc/RTCAVFoundationVideoSource+Private.h',
|
| - 'objc/RTCAVFoundationVideoSource.h',
|
| - 'objc/RTCAVFoundationVideoSource.mm',
|
| 'objc/RTCAudioTrack+Private.h',
|
| 'objc/RTCAudioTrack.h',
|
| 'objc/RTCAudioTrack.mm',
|
| @@ -203,14 +201,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': {
|
| @@ -240,14 +241,9 @@
|
| ],
|
| }],
|
| ],
|
| - 'xcode_settings': {
|
| - 'CLANG_ENABLE_OBJC_ARC': 'YES',
|
| - 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
|
| - 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
|
| - },
|
| }
|
| ],
|
| - }], # OS=="ios"
|
| + }], # OS=="ios" or OS=="mac"
|
| ], # conditions
|
| 'targets': [
|
| {
|
|
|