diff --git a/.gitmodules b/.gitmodules index 4a8a9c0e8..4b0161d77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -120,3 +120,9 @@ [submodule "submodules/externals/zxing-cpp"] path = submodules/externals/zxing-cpp url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git +[submodule "submodules/externals/decaf"] + path = submodules/externals/decaf + url = https://gitlab.linphone.org/BC/public/external/decaf.git +[submodule "submodules/lime"] + path = submodules/lime + url = https://gitlab.linphone.org/BC/public/lime.git diff --git a/prepare.conf b/prepare.conf new file mode 100644 index 000000000..bc4c93b42 --- /dev/null +++ b/prepare.conf @@ -0,0 +1,5 @@ +-DENABLE_LIME_X3DH=yes +-DENABLE_LIME=no +-DENABLE_SOCI=yes +-DENABLE_QRCODE=yes + diff --git a/submodules/bctoolbox b/submodules/bctoolbox index d5713996c..405da744b 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit d5713996c2ae100594ebf319c54d95297b02a2e1 +Subproject commit 405da744b62e299d4324988de7bcdbf9779b21ac diff --git a/submodules/belle-sip b/submodules/belle-sip index 7a750d63b..0f999ecc3 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7a750d63bbb930b899738bcaf1af21f0785bee1c +Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8 diff --git a/submodules/bzrtp b/submodules/bzrtp index 41b2163c8..94f0d8d3a 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 41b2163c865fed835abc013ecaa25267fa2b1d63 +Subproject commit 94f0d8d3a267f899e9604604c74e876baba26306 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 210a3c55c..941d793a2 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 210a3c55cd75c70e7f807cf08464493ea62e4458 +Subproject commit 941d793a2ca144e858a6d01e207992c384a4c7d3 diff --git a/submodules/externals/decaf b/submodules/externals/decaf new file mode 160000 index 000000000..8caffb8b8 --- /dev/null +++ b/submodules/externals/decaf @@ -0,0 +1 @@ +Subproject commit 8caffb8b8e67d0d7a5a53e5997c6f3b8f8e85e5e diff --git a/submodules/lime b/submodules/lime new file mode 160000 index 000000000..e3746d4b8 --- /dev/null +++ b/submodules/lime @@ -0,0 +1 @@ +Subproject commit e3746d4b80d1a18e4b9f2e76890d6b4b2daad4e3 diff --git a/submodules/linphone b/submodules/linphone index ebf1d1195..6edf43c37 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ebf1d1195f22091371894b0c3e66063bce98bb96 +Subproject commit 6edf43c37dfc4e2c4d785fd4068748a158a4b264 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 1d6722bbb..18453dd71 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 1d6722bbb6b7d5609c148ab782869bb49b21f26b +Subproject commit 18453dd7135b8893ce6dc89abf715e9455e52fc5