| 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', ], |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 'java/android', | 115 'java/android', |
| 116 '<(webrtc_base_dir)/java/src', | 116 '<(webrtc_base_dir)/java/src', |
| 117 '<(webrtc_modules_dir)/audio_device/android/java/src', | 117 '<(webrtc_modules_dir)/audio_device/android/java/src', |
| 118 '<(webrtc_modules_dir)/video_render/android/java/src', | 118 '<(webrtc_modules_dir)/video_render/android/java/src', |
| 119 ], | 119 ], |
| 120 }, | 120 }, |
| 121 'includes': ['../../build/java.gypi'], | 121 'includes': ['../../build/java.gypi'], |
| 122 }, # libjingle_peerconnection_java | 122 }, # libjingle_peerconnection_java |
| 123 ] | 123 ] |
| 124 }], | 124 }], |
| 125 ['OS=="ios"', { | 125 ['OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")', { |
| 126 'targets': [ | 126 'targets': [ |
| 127 { | 127 { |
| 128 'target_name': 'rtc_api_objc', | 128 'target_name': 'rtc_api_objc', |
| 129 'type': 'static_library', | 129 'type': 'static_library', |
| 130 'includes': [ |
| 131 '../build/objc_common.gypi', |
| 132 ], |
| 130 'dependencies': [ | 133 'dependencies': [ |
| 131 '<(webrtc_root)/base/base.gyp:rtc_base_objc', | 134 '<(webrtc_root)/base/base.gyp:rtc_base_objc', |
| 132 'libjingle_peerconnection', | 135 'libjingle_peerconnection', |
| 133 ], | 136 ], |
| 134 'sources': [ | 137 'sources': [ |
| 135 'objc/RTCAVFoundationVideoSource+Private.h', | |
| 136 'objc/RTCAVFoundationVideoSource.h', | |
| 137 'objc/RTCAVFoundationVideoSource.mm', | |
| 138 'objc/RTCAudioTrack+Private.h', | 138 'objc/RTCAudioTrack+Private.h', |
| 139 'objc/RTCAudioTrack.h', | 139 'objc/RTCAudioTrack.h', |
| 140 'objc/RTCAudioTrack.mm', | 140 'objc/RTCAudioTrack.mm', |
| 141 'objc/RTCConfiguration+Private.h', | 141 'objc/RTCConfiguration+Private.h', |
| 142 'objc/RTCConfiguration.h', | 142 'objc/RTCConfiguration.h', |
| 143 'objc/RTCConfiguration.mm', | 143 'objc/RTCConfiguration.mm', |
| 144 'objc/RTCDataChannel+Private.h', | 144 'objc/RTCDataChannel+Private.h', |
| 145 'objc/RTCDataChannel.h', | 145 'objc/RTCDataChannel.h', |
| 146 'objc/RTCDataChannel.mm', | 146 'objc/RTCDataChannel.mm', |
| 147 'objc/RTCDataChannelConfiguration+Private.h', | 147 'objc/RTCDataChannelConfiguration+Private.h', |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 'objc/RTCVideoRenderer.h', | 184 'objc/RTCVideoRenderer.h', |
| 185 'objc/RTCVideoRendererAdapter+Private.h', | 185 'objc/RTCVideoRendererAdapter+Private.h', |
| 186 'objc/RTCVideoRendererAdapter.h', | 186 'objc/RTCVideoRendererAdapter.h', |
| 187 'objc/RTCVideoRendererAdapter.mm', | 187 'objc/RTCVideoRendererAdapter.mm', |
| 188 'objc/RTCVideoSource+Private.h', | 188 'objc/RTCVideoSource+Private.h', |
| 189 'objc/RTCVideoSource.h', | 189 'objc/RTCVideoSource.h', |
| 190 'objc/RTCVideoSource.mm', | 190 'objc/RTCVideoSource.mm', |
| 191 'objc/RTCVideoTrack+Private.h', | 191 'objc/RTCVideoTrack+Private.h', |
| 192 'objc/RTCVideoTrack.h', | 192 'objc/RTCVideoTrack.h', |
| 193 'objc/RTCVideoTrack.mm', | 193 'objc/RTCVideoTrack.mm', |
| 194 'objc/avfoundationvideocapturer.h', | |
| 195 'objc/avfoundationvideocapturer.mm', | |
| 196 ], | 194 ], |
| 197 'conditions': [ | 195 'conditions': [ |
| 198 ['OS=="ios"', { | 196 ['OS=="ios"', { |
| 199 'sources': [ | 197 'sources': [ |
| 198 'objc/RTCAVFoundationVideoSource+Private.h', |
| 199 'objc/RTCAVFoundationVideoSource.h', |
| 200 'objc/RTCAVFoundationVideoSource.mm', |
| 200 'objc/RTCEAGLVideoView.h', | 201 'objc/RTCEAGLVideoView.h', |
| 201 'objc/RTCEAGLVideoView.m', | 202 'objc/RTCEAGLVideoView.m', |
| 203 'objc/avfoundationvideocapturer.h', |
| 204 'objc/avfoundationvideocapturer.mm', |
| 202 ], | 205 ], |
| 203 'all_dependent_settings': { | 206 'all_dependent_settings': { |
| 204 'xcode_settings': { | 207 'xcode_settings': { |
| 205 'OTHER_LDFLAGS': [ | 208 'OTHER_LDFLAGS': [ |
| 206 '-framework CoreGraphics', | 209 '-framework CoreGraphics', |
| 207 '-framework GLKit', | 210 '-framework GLKit', |
| 208 '-framework OpenGLES', | 211 '-framework OpenGLES', |
| 209 '-framework QuartzCore', | 212 '-framework QuartzCore', |
| 210 ] | 213 ] |
| 211 } | 214 } |
| 212 }, | 215 }, |
| 213 # TODO(kjellander): Make the code compile without disabling these. | 216 # TODO(kjellander): Make the code compile without disabling these. |
| 214 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 | 217 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 |
| 215 'cflags': [ | 218 'cflags': [ |
| 216 '-Wno-return-type', | 219 '-Wno-return-type', |
| 217 ], | 220 ], |
| 218 'xcode_settings': { | 221 'xcode_settings': { |
| 219 'WARNING_CFLAGS': [ | 222 'WARNING_CFLAGS': [ |
| 220 '-Wno-return-type', | 223 '-Wno-return-type', |
| 221 ], | 224 ], |
| 222 }, | 225 }, |
| 223 }], | 226 }], |
| 224 ['OS=="mac"', { | 227 ['OS=="mac"', { |
| 225 'sources': [ | 228 'sources': [ |
| 226 'objc/RTCNSGLVideoView.h', | 229 'objc/RTCNSGLVideoView.h', |
| 227 'objc/RTCNSGLVideoView.m', | 230 'objc/RTCNSGLVideoView.m', |
| 228 ], | 231 ], |
| 229 }], | 232 }], |
| 230 ], | 233 ], |
| 231 'xcode_settings': { | |
| 232 'CLANG_ENABLE_OBJC_ARC': 'YES', | |
| 233 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | |
| 234 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', | |
| 235 }, | |
| 236 } | 234 } |
| 237 ], | 235 ], |
| 238 }], # OS=="ios" | 236 }], # OS=="ios" |
| 239 ], # conditions | 237 ], # conditions |
| 240 'targets': [ | 238 'targets': [ |
| 241 { | 239 { |
| 242 'target_name': 'libjingle_peerconnection', | 240 'target_name': 'libjingle_peerconnection', |
| 243 'type': 'static_library', | 241 'type': 'static_library', |
| 244 'dependencies': [ | 242 'dependencies': [ |
| 245 '<(webrtc_root)/media/media.gyp:rtc_media', | 243 '<(webrtc_root)/media/media.gyp:rtc_media', |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 'AdditionalOptions': [ | 351 'AdditionalOptions': [ |
| 354 '-Wno-sign-compare', | 352 '-Wno-sign-compare', |
| 355 ], | 353 ], |
| 356 }, | 354 }, |
| 357 }, | 355 }, |
| 358 }], | 356 }], |
| 359 ], | 357 ], |
| 360 }, # target libjingle_peerconnection | 358 }, # target libjingle_peerconnection |
| 361 ], # targets | 359 ], # targets |
| 362 } | 360 } |
| OLD | NEW |