admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Mac ObjC PeerConnection API compilation.

Browse Source 
BUG=webrtc:5287,webrtc:5216

Review URL: https://codereview.webrtc.org/1493003002

Cr-Commit-Position: refs/heads/master@{#10876}
This commit is contained in:
tkchin 2015-12-02 16:42:18 -08:00 committed by Commit bot
parent 9462052f32
commit 7635684130
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/build/merge_ios_libs.gyp
View File

@ -27,7 +27,7 @@
{
'includes': ['common.gypi',],
'conditions': [
['OS=="ios" or (OS=="mac" and mac_sdk>="10.8")', {
['OS=="ios" or OS=="mac"', {
'targets': [
{
'target_name': 'libjingle_peerconnection_objc_no_op',

2
talk/libjingle.gyp
View File

@ -248,7 +248,7 @@
}, # libjingle_peerconnection_java
]
}],
['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
# The >= 10.7 above is required for ARC.
'targets': [
{

2
talk/libjingle_tests.gyp
View File

@ -332,7 +332,7 @@
},
], # targets
}], # OS=="android"
['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
# The >=10.7 above is required to make ARC link cleanly (e.g. as
# opposed to _compile_ cleanly, which the library under test
# does just fine on 10.6 too).

5
webrtc/webrtc_examples.gyp
View File

@ -132,7 +132,7 @@
], # targets
}], # OS=="linux" or OS=="win"
['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")', {
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'targets': [
{
'target_name': 'apprtc_common',
@ -332,6 +332,7 @@
'CLANG_ENABLE_OBJC_ARC': 'YES',
'WARNING_CFLAGS': [
'-Wno-deprecated-declarations',
'-Wno-nonnull',
],
},
'link_settings': {
@ -344,7 +345,7 @@
}
}, # target socketrocket
], # targets
}], # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")
}], # OS=="ios" or (OS=="mac" and target_arch!="ia32")
['OS=="android"', {
'targets': [