zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable ObjC build by default and reenable 64-bit mac libjingle build

Browse Source 
BUG=2124
TESTED=trybots & building for mac, mac64, ios-sim, and ios-device on my MBP all build everything in out/Debug.
R=niklas.enbom@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2080004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4620 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org
2013-08-26 19:31:21 +00:00
parent 4498d013f6
commit e3de6b1e90
7 changed files with 87 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
all.gyp
View File

@ -14,17 +14,9 @@
'type': 'none',
'dependencies': [
'webrtc/webrtc.gyp:*',
],
# TODO(henrike): fix build errors on 64 bit Mac for libjingle. See issue
# 2124. Once done the entire conditional below can be removed.
'conditions': [
['OS!="mac" or target_arch!="x64" or libjingle_objc==1', {
'dependencies': [
'talk/libjingle.gyp:*',
'talk/libjingle_examples.gyp:*',
'talk/libjingle_tests.gyp:*',
],
}],
'talk/libjingle.gyp:*',
'talk/libjingle_examples.gyp:*',
'talk/libjingle_tests.gyp:*',
],
},
],