Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: webrtc/api/api.gyp

Issue 1726213002: Compile rtc_api_objc on Mac. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update TODO format Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/api/api_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/api.gyp
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index c9add179feaa5384f6f52f8e4df3aa5d07fd627f..4fe8ce845884faf8014450b9431e77a9ef45b03b 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -122,19 +122,19 @@
}, # libjingle_peerconnection_java
]
}],
- ['OS=="ios"', {
+ ['OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")', {
'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',
@@ -191,14 +191,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': {
@@ -228,11 +231,6 @@
],
}],
],
- 'xcode_settings': {
- 'CLANG_ENABLE_OBJC_ARC': 'YES',
- 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
- 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
- },
}
],
}], # OS=="ios"
« no previous file with comments | « no previous file | webrtc/api/api_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698