From 759d1e99fbe4bf312a5d4b34bcd1c572af34e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20H=C3=BCbelbauer?= Date: Thu, 20 Jul 2017 03:37:02 +0200 Subject: [PATCH 1/3] Add a hint to disable bitcode to fix WebRTC linking (#35) --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c66f9e..540775b 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ - [Links](#links) # Installation +Check the [Bitcode](#bitcode) section first to avoid linker errors! __Cocoapods__ (add to Podfile): @@ -68,7 +69,9 @@ NSLog(@"%d", RTCInitializeSSL()); # Bitcode -Bitcode isn't supported in the upstream for now. So you should disable it in the project build settings. +Bitcode isn't supported in the upstream for now. So you should disable it: + +Go to your project's settings and find the *Build settings* tab, check *All* and search for *bitcode*, then disable it. # Information From cbd325d7430dc4eb3c9f5519ca515a356cef79af Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 20 Jul 2017 10:20:39 +0700 Subject: [PATCH 2/3] Update README.md --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 540775b..03d253b 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,10 @@ # WebRTC iOS framework -![](https://img.shields.io/cocoapods/v/WebRTC.svg?maxAge=100) ![](https://img.shields.io/cocoapods/dw/WebRTC.svg?maxAge=100) -![](https://img.shields.io/cocoapods/l/WebRTC.svg?maxAge=100) - [__!!!__] Please report all WebRTC related (not specific to this binary build) bugs and questions to [discussion group](https://groups.google.com/forum/#!forum/discuss-webrtc) or [official bug tracker](https://bugs.chromium.org/p/webrtc/issues/list) # Contents - [Installation](#installation) - - [Unstable versions](#unstable-versions) - [Usage](#usage) - [Bitcode](#bitcode) - [Information](#information) @@ -33,18 +29,6 @@ __Manual__: just download framework from [the latest release](https://github.com >You can only use the binary release, because the whole WebRTC repository takes ~12Gb of disk space -## Unstable versions - -__Cocoapods__ (will install specified unstable version or _any_ higher version): -```ruby -pod "WebRTC", ">= 56.0.14835-beta" -``` - -__Carthage__ (there is no way to auto-update to the latest unstable version at the current moment, so you should specify [corresponding version tag](https://github.com/Anakros/WebRTC/tags)): -``` -github "Anakros/WebRTC" "56.0.14835-beta" -``` - # Usage ## Swift @@ -75,7 +59,23 @@ Go to your project's settings and find the *Build settings* tab, check *All* and # Information -Built from `https://chromium.googlesource.com/external/webrtc/` using `webrtc/build/ios/build_ios_libs.sh` script without any modifications. +Built from `https://chromium.googlesource.com/external/webrtc/` using `webrtc/build/ios/build_ios_libs.py` script with following modifications (to enable x86 architecture): + +```diff +diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py +index 734f3e216..e6f250c97 100755 +--- a/tools_webrtc/ios/build_ios_libs.py ++++ b/tools_webrtc/ios/build_ios_libs.py +@@ -165,8 +165,6 @@ def main(): + + # Ignoring x86 except for static libraries for now because of a GN build issue + # where the generated dynamic framework has the wrong architectures. +- if 'x86' in architectures and args.build_type != 'static_only': +- architectures.remove('x86') + + # Build all architectures. + for arch in architectures: +``` # Links From 0dbb9ac1ac7e96cb189f79ccfe3bb2a027022021 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 20 Jul 2017 10:21:42 +0700 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03d253b..82d0de7 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Go to your project's settings and find the *Build settings* tab, check *All* and # Information -Built from `https://chromium.googlesource.com/external/webrtc/` using `webrtc/build/ios/build_ios_libs.py` script with following modifications (to enable x86 architecture): +Built from `https://chromium.googlesource.com/external/webrtc/` using `tools_webrtc/ios/build_ios_libs.py` script with following modifications (to enable x86 architecture): ```diff diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py