Chromium Code Reviews| Index: webrtc/api/api.gyp |
| diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp |
| index ec51b4772819758fd92c5cdc8836c5852d74a9e8..27af06657e23fb3ac39bc13465fe8c778e1cdc0e 100644 |
| --- a/webrtc/api/api.gyp |
| +++ b/webrtc/api/api.gyp |
| @@ -9,19 +9,18 @@ |
| { |
| 'includes': [ '../build/common.gypi', ], |
| 'conditions': [ |
| - ['OS=="ios"', { |
| + ['OS=="ios" or (OS=="mac" and mac_deployment_target_major>=10 and ' |
|
kjellander_webrtc
2016/02/01 06:08:29
I guess when Apple (if ever) increments the mac_de
hjon_webrtc
2016/02/04 01:43:03
Do you think this should still be == rather than >
kjellander_webrtc
2016/02/08 09:25:52
I guess == is better than >= since it makes it mor
|
| + 'mac_deployment_target_minor>=10)', { |
| '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 +72,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 +102,6 @@ |
| ], |
| }], |
| ], |
| - 'xcode_settings': { |
| - 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| - 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| - 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', |
| - }, |
| } |
| ], |
| }], # OS=="ios" |