mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 02:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'public/master' into 3.0.x

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-11-05 15:42:40 +01:00
commit 96531b2224
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -40,14 +40,13 @@ This SDK can be generated in 2 flavors:
## Customizing features
You can enable all non-free codecs using `--enable-non-free-codecs`.
You can also choose to enable/disable features one by one (custom audio/video codecs, media encryption, etc.). To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`:
You can enable non-free codecs by using `--enable-non-free-codecs` and `-DENABLE_<codec>=ON`. To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`:
./prepare.py --list-features
You can for instance enable X264 by using:
./prepare.py -DENABLE_X264=ON [other options]
./prepare.py --enable-non-free-codecs -DENABLE_X264=ON [other options]
## Built architectures

8
linphone.xcodeproj/project.pbxproj
View file

@ -3938,7 +3938,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -4023,7 +4023,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -4108,7 +4108,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -4193,7 +4193,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
ENABLE_BITCODE = NO;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 92f86c8a2c7b0adb461e945ca508b8ef5aa5db3c
Subproject commit 9e27991eb93b7e2b5dfa7d447f42bffab86a4e79

2
submodules/externals/polarssl vendored

@ -1 +1 @@
Subproject commit 5e723467b44d2d2128eba54bbad3e80d8dbdac05
Subproject commit 919006f5f33febe72205078a125fae811b12a3d6