| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 'java/android', | 127 'java/android', |
| 128 '<(webrtc_base_dir)/java/src', | 128 '<(webrtc_base_dir)/java/src', |
| 129 '<(webrtc_modules_dir)/audio_device/android/java/src', | 129 '<(webrtc_modules_dir)/audio_device/android/java/src', |
| 130 '<(webrtc_modules_dir)/video_render/android/java/src', | 130 '<(webrtc_modules_dir)/video_render/android/java/src', |
| 131 ], | 131 ], |
| 132 }, | 132 }, |
| 133 'includes': ['../../build/java.gypi'], | 133 'includes': ['../../build/java.gypi'], |
| 134 }, # libjingle_peerconnection_java | 134 }, # libjingle_peerconnection_java |
| 135 ] | 135 ] |
| 136 }], | 136 }], |
| 137 ['OS=="ios"', { | 137 ['OS=="ios" or OS=="mac"', { |
| 138 'targets': [ | 138 'targets': [ |
| 139 { | 139 { |
| 140 'target_name': 'rtc_api_objc', | 140 'target_name': 'rtc_api_objc', |
| 141 'type': 'static_library', | 141 'type': 'static_library', |
| 142 'includes': [ '../build/objc_common.gypi' ], |
| 142 'dependencies': [ | 143 'dependencies': [ |
| 143 '<(webrtc_root)/base/base.gyp:rtc_base_objc', | 144 '<(webrtc_root)/base/base.gyp:rtc_base_objc', |
| 144 'libjingle_peerconnection', | 145 'libjingle_peerconnection', |
| 145 ], | 146 ], |
| 146 'sources': [ | 147 'sources': [ |
| 147 'objc/RTCAVFoundationVideoSource+Private.h', | |
| 148 'objc/RTCAVFoundationVideoSource.h', | |
| 149 'objc/RTCAVFoundationVideoSource.mm', | |
| 150 'objc/RTCAudioTrack+Private.h', | 148 'objc/RTCAudioTrack+Private.h', |
| 151 'objc/RTCAudioTrack.h', | 149 'objc/RTCAudioTrack.h', |
| 152 'objc/RTCAudioTrack.mm', | 150 'objc/RTCAudioTrack.mm', |
| 153 'objc/RTCConfiguration+Private.h', | 151 'objc/RTCConfiguration+Private.h', |
| 154 'objc/RTCConfiguration.h', | 152 'objc/RTCConfiguration.h', |
| 155 'objc/RTCConfiguration.mm', | 153 'objc/RTCConfiguration.mm', |
| 156 'objc/RTCDataChannel+Private.h', | 154 'objc/RTCDataChannel+Private.h', |
| 157 'objc/RTCDataChannel.h', | 155 'objc/RTCDataChannel.h', |
| 158 'objc/RTCDataChannel.mm', | 156 'objc/RTCDataChannel.mm', |
| 159 'objc/RTCDataChannelConfiguration+Private.h', | 157 'objc/RTCDataChannelConfiguration+Private.h', |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 'objc/RTCVideoRenderer.h', | 194 'objc/RTCVideoRenderer.h', |
| 197 'objc/RTCVideoRendererAdapter+Private.h', | 195 'objc/RTCVideoRendererAdapter+Private.h', |
| 198 'objc/RTCVideoRendererAdapter.h', | 196 'objc/RTCVideoRendererAdapter.h', |
| 199 'objc/RTCVideoRendererAdapter.mm', | 197 'objc/RTCVideoRendererAdapter.mm', |
| 200 'objc/RTCVideoSource+Private.h', | 198 'objc/RTCVideoSource+Private.h', |
| 201 'objc/RTCVideoSource.h', | 199 'objc/RTCVideoSource.h', |
| 202 'objc/RTCVideoSource.mm', | 200 'objc/RTCVideoSource.mm', |
| 203 'objc/RTCVideoTrack+Private.h', | 201 'objc/RTCVideoTrack+Private.h', |
| 204 'objc/RTCVideoTrack.h', | 202 'objc/RTCVideoTrack.h', |
| 205 'objc/RTCVideoTrack.mm', | 203 'objc/RTCVideoTrack.mm', |
| 206 'objc/avfoundationvideocapturer.h', | |
| 207 'objc/avfoundationvideocapturer.mm', | |
| 208 ], | 204 ], |
| 209 'conditions': [ | 205 'conditions': [ |
| 210 ['OS=="ios"', { | 206 ['OS=="ios"', { |
| 211 'sources': [ | 207 'sources': [ |
| 208 'objc/RTCAVFoundationVideoSource+Private.h', |
| 209 'objc/RTCAVFoundationVideoSource.h', |
| 210 'objc/RTCAVFoundationVideoSource.mm', |
| 212 'objc/RTCEAGLVideoView.h', | 211 'objc/RTCEAGLVideoView.h', |
| 213 'objc/RTCEAGLVideoView.m', | 212 'objc/RTCEAGLVideoView.m', |
| 213 'objc/avfoundationvideocapturer.h', |
| 214 'objc/avfoundationvideocapturer.mm', |
| 214 ], | 215 ], |
| 215 'all_dependent_settings': { | 216 'all_dependent_settings': { |
| 216 'xcode_settings': { | 217 'xcode_settings': { |
| 217 'OTHER_LDFLAGS': [ | 218 'OTHER_LDFLAGS': [ |
| 218 '-framework CoreGraphics', | 219 '-framework CoreGraphics', |
| 219 '-framework GLKit', | 220 '-framework GLKit', |
| 220 '-framework OpenGLES', | 221 '-framework OpenGLES', |
| 221 '-framework QuartzCore', | 222 '-framework QuartzCore', |
| 222 ] | 223 ] |
| 223 } | 224 } |
| 224 }, | 225 }, |
| 225 # TODO(kjellander): Make the code compile without disabling these. | 226 # TODO(kjellander): Make the code compile without disabling these. |
| 226 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 | 227 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 |
| 227 'cflags': [ | 228 'cflags': [ |
| 228 '-Wno-return-type', | 229 '-Wno-return-type', |
| 229 ], | 230 ], |
| 230 'xcode_settings': { | 231 'xcode_settings': { |
| 231 'WARNING_CFLAGS': [ | 232 'WARNING_CFLAGS': [ |
| 232 '-Wno-return-type', | 233 '-Wno-return-type', |
| 233 ], | 234 ], |
| 234 }, | 235 }, |
| 235 }], | 236 }], |
| 236 ['OS=="mac"', { | 237 ['OS=="mac"', { |
| 237 'sources': [ | 238 'sources': [ |
| 238 'objc/RTCNSGLVideoView.h', | 239 'objc/RTCNSGLVideoView.h', |
| 239 'objc/RTCNSGLVideoView.m', | 240 'objc/RTCNSGLVideoView.m', |
| 240 ], | 241 ], |
| 241 }], | 242 }], |
| 242 ], | 243 ], |
| 243 'xcode_settings': { | |
| 244 'CLANG_ENABLE_OBJC_ARC': 'YES', | |
| 245 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | |
| 246 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', | |
| 247 }, | |
| 248 } | 244 } |
| 249 ], | 245 ], |
| 250 }], # OS=="ios" | 246 }], # OS=="ios" or OS=="mac" |
| 251 ], # conditions | 247 ], # conditions |
| 252 'targets': [ | 248 'targets': [ |
| 253 { | 249 { |
| 254 'target_name': 'libjingle_peerconnection', | 250 'target_name': 'libjingle_peerconnection', |
| 255 'type': 'static_library', | 251 'type': 'static_library', |
| 256 'dependencies': [ | 252 'dependencies': [ |
| 257 '<(webrtc_root)/media/media.gyp:rtc_media', | 253 '<(webrtc_root)/media/media.gyp:rtc_media', |
| 258 '<(webrtc_root)/pc/pc.gyp:rtc_pc', | 254 '<(webrtc_root)/pc/pc.gyp:rtc_pc', |
| 259 ], | 255 ], |
| 260 'sources': [ | 256 'sources': [ |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 'AdditionalOptions': [ | 361 'AdditionalOptions': [ |
| 366 '-Wno-sign-compare', | 362 '-Wno-sign-compare', |
| 367 ], | 363 ], |
| 368 }, | 364 }, |
| 369 }, | 365 }, |
| 370 }], | 366 }], |
| 371 ], | 367 ], |
| 372 }, # target libjingle_peerconnection | 368 }, # target libjingle_peerconnection |
| 373 ], # targets | 369 ], # targets |
| 374 } | 370 } |
| OLD | NEW |