From 4a56e94792ac046b443f3a52002d87dd77b9b0da Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 9 Jun 2016 17:19:40 +0200 Subject: [PATCH] fix lime issue with file transfer. add codec2 to all-codecs buils --- .gitmodules | 6 ++++++ prepare.py | 1 + submodules/cmake-builder | 2 +- submodules/externals/codec2 | 1 + submodules/linphone | 2 +- submodules/mscodec2 | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) create mode 160000 submodules/externals/codec2 create mode 160000 submodules/mscodec2 diff --git a/.gitmodules b/.gitmodules index e2b5f3ec3..20f1a6887 100644 --- a/.gitmodules +++ b/.gitmodules @@ -97,3 +97,9 @@ [submodule "submodules/externals/mbedtls"] path = submodules/externals/mbedtls url = git://git.linphone.org/mbedtls.git +[submodule "submodules/externals/codec2"] + path = submodules/externals/codec2 + url = git://git.linphone.org/codec2.git +[submodule "submodules/mscodec2"] + path = submodules/mscodec2 + url = git://git.linphone.org/mscodec2.git diff --git a/prepare.py b/prepare.py index 6f3656259..e237e7392 100755 --- a/prepare.py +++ b/prepare.py @@ -123,6 +123,7 @@ class IOSPreparator(prepare.Preparator): self.additional_args += ["-DENABLE_OPENH264=ON"] self.additional_args += ["-DENABLE_VPX=ON"] self.additional_args += ["-DENABLE_X264=ON"] + self.additional_args += ["-DENABLE_CODEC2=ON"] def clean(self): prepare.Preparator.clean(self) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 1abdf9def..e6fa040c3 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 1abdf9defb44e945a238177d67832896f40bd23e +Subproject commit e6fa040c3bee260dc4ea2bfefdc952b490d42564 diff --git a/submodules/externals/codec2 b/submodules/externals/codec2 new file mode 160000 index 000000000..4e154e6bb --- /dev/null +++ b/submodules/externals/codec2 @@ -0,0 +1 @@ +Subproject commit 4e154e6bbbe92cc76e333a0b4acb365b5c042ec6 diff --git a/submodules/linphone b/submodules/linphone index 00236d147..d8158669f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 00236d147f2d154eb5397e615c4ca6a5593f191b +Subproject commit d8158669f356262a93034645f2bb14829127bba4 diff --git a/submodules/mscodec2 b/submodules/mscodec2 new file mode 160000 index 000000000..5e7d07327 --- /dev/null +++ b/submodules/mscodec2 @@ -0,0 +1 @@ +Subproject commit 5e7d07327d114791e1be6de99002177d5b3d4385