Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 { | 9 { |
| 10 'includes': [ '../build/common.gypi', ], | 10 'includes': [ '../build/common.gypi', ], |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 ['OS=="ios"', { | 12 ['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
| |
| 13 'mac_deployment_target_minor>=10)', { | |
| 13 'targets': [ | 14 'targets': [ |
| 14 { | 15 { |
| 15 'target_name': 'rtc_api_objc', | 16 'target_name': 'rtc_api_objc', |
| 16 'type': 'static_library', | 17 'type': 'static_library', |
| 18 'includes': [ '../build/objc_common.gypi' ], | |
| 17 'dependencies': [ | 19 'dependencies': [ |
| 18 '<(webrtc_root)/base/base.gyp:rtc_base_objc', | 20 '<(webrtc_root)/base/base.gyp:rtc_base_objc', |
| 19 '../../talk/libjingle.gyp:libjingle_peerconnection', | 21 '../../talk/libjingle.gyp:libjingle_peerconnection', |
| 20 ], | 22 ], |
| 21 'sources': [ | 23 'sources': [ |
| 22 'objc/RTCAVFoundationVideoSource+Private.h', | |
| 23 'objc/RTCAVFoundationVideoSource.h', | |
| 24 'objc/RTCAVFoundationVideoSource.mm', | |
| 25 'objc/RTCAudioTrack+Private.h', | 24 'objc/RTCAudioTrack+Private.h', |
| 26 'objc/RTCAudioTrack.h', | 25 'objc/RTCAudioTrack.h', |
| 27 'objc/RTCAudioTrack.mm', | 26 'objc/RTCAudioTrack.mm', |
| 28 'objc/RTCConfiguration+Private.h', | 27 'objc/RTCConfiguration+Private.h', |
| 29 'objc/RTCConfiguration.h', | 28 'objc/RTCConfiguration.h', |
| 30 'objc/RTCConfiguration.mm', | 29 'objc/RTCConfiguration.mm', |
| 31 'objc/RTCDataChannel+Private.h', | 30 'objc/RTCDataChannel+Private.h', |
| 32 'objc/RTCDataChannel.h', | 31 'objc/RTCDataChannel.h', |
| 33 'objc/RTCDataChannel.mm', | 32 'objc/RTCDataChannel.mm', |
| 34 'objc/RTCDataChannelConfiguration+Private.h', | 33 'objc/RTCDataChannelConfiguration+Private.h', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 'objc/RTCVideoRenderer.h', | 65 'objc/RTCVideoRenderer.h', |
| 67 'objc/RTCVideoRendererAdapter+Private.h', | 66 'objc/RTCVideoRendererAdapter+Private.h', |
| 68 'objc/RTCVideoRendererAdapter.h', | 67 'objc/RTCVideoRendererAdapter.h', |
| 69 'objc/RTCVideoRendererAdapter.mm', | 68 'objc/RTCVideoRendererAdapter.mm', |
| 70 'objc/RTCVideoSource+Private.h', | 69 'objc/RTCVideoSource+Private.h', |
| 71 'objc/RTCVideoSource.h', | 70 'objc/RTCVideoSource.h', |
| 72 'objc/RTCVideoSource.mm', | 71 'objc/RTCVideoSource.mm', |
| 73 'objc/RTCVideoTrack+Private.h', | 72 'objc/RTCVideoTrack+Private.h', |
| 74 'objc/RTCVideoTrack.h', | 73 'objc/RTCVideoTrack.h', |
| 75 'objc/RTCVideoTrack.mm', | 74 'objc/RTCVideoTrack.mm', |
| 76 'objc/avfoundationvideocapturer.h', | |
| 77 'objc/avfoundationvideocapturer.mm', | |
| 78 ], | 75 ], |
| 79 'conditions': [ | 76 'conditions': [ |
| 80 ['OS=="ios"', { | 77 ['OS=="ios"', { |
| 81 'sources': [ | 78 'sources': [ |
| 79 'objc/RTCAVFoundationVideoSource+Private.h', | |
| 80 'objc/RTCAVFoundationVideoSource.h', | |
| 81 'objc/RTCAVFoundationVideoSource.mm', | |
| 82 'objc/RTCEAGLVideoView.h', | 82 'objc/RTCEAGLVideoView.h', |
| 83 'objc/RTCEAGLVideoView.m', | 83 'objc/RTCEAGLVideoView.m', |
| 84 'objc/avfoundationvideocapturer.h', | |
| 85 'objc/avfoundationvideocapturer.mm', | |
| 84 ], | 86 ], |
| 85 'all_dependent_settings': { | 87 'all_dependent_settings': { |
| 86 'xcode_settings': { | 88 'xcode_settings': { |
| 87 'OTHER_LDFLAGS': [ | 89 'OTHER_LDFLAGS': [ |
| 88 '-framework CoreGraphics', | 90 '-framework CoreGraphics', |
| 89 '-framework GLKit', | 91 '-framework GLKit', |
| 90 '-framework OpenGLES', | 92 '-framework OpenGLES', |
| 91 '-framework QuartzCore', | 93 '-framework QuartzCore', |
| 92 ] | 94 ] |
| 93 } | 95 } |
| 94 } | 96 } |
| 95 }], | 97 }], |
| 96 ['OS=="mac"', { | 98 ['OS=="mac"', { |
| 97 'sources': [ | 99 'sources': [ |
| 98 'objc/RTCNSGLVideoView.h', | 100 'objc/RTCNSGLVideoView.h', |
| 99 'objc/RTCNSGLVideoView.m', | 101 'objc/RTCNSGLVideoView.m', |
| 100 ], | 102 ], |
| 101 }], | 103 }], |
| 102 ], | 104 ], |
| 103 'xcode_settings': { | |
| 104 'CLANG_ENABLE_OBJC_ARC': 'YES', | |
| 105 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | |
| 106 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', | |
| 107 }, | |
| 108 } | 105 } |
| 109 ], | 106 ], |
| 110 }], # OS=="ios" | 107 }], # OS=="ios" |
| 111 ], | 108 ], |
| 112 } | 109 } |
| OLD | NEW |