diff --git a/.gitmodules b/.gitmodules index 48fe67ce6c..1ce899afc6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "Telegram/ThirdParty/libtgvoip"] path = Telegram/ThirdParty/libtgvoip url = https://github.com/telegramdesktop/libtgvoip -[submodule "Telegram/ThirdParty/variant"] - path = Telegram/ThirdParty/variant - url = https://github.com/desktop-app/variant.git [submodule "Telegram/ThirdParty/GSL"] path = Telegram/ThirdParty/GSL url = https://github.com/Microsoft/GSL.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 645d886a04..cce0c8a455 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,5 +36,9 @@ include(cmake/options.cmake) include(cmake/external/qt/package.cmake) +set(desktop_app_skip_libs + variant +) + add_subdirectory(cmake) add_subdirectory(Telegram) diff --git a/README.md b/README.md index a08906b468..dd331b73db 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Version **1.8.15** was the last that supports older systems * Qt 5.12.8, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) * OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html)) +* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/src/LICENSE)) * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html)) * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html)) * liblzma ([public domain](http://tukaani.org/xz/)) @@ -45,7 +46,6 @@ Version **1.8.15** was the last that supports older systems * Opus codec ([BSD License](http://www.opus-codec.org/license/)) * FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html)) * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE)) -* Mapbox Variant ([BSD License](https://github.com/mapbox/variant/blob/master/LICENSE)) * Range-v3 ([Boost License](https://github.com/ericniebler/range-v3/blob/master/LICENSE.txt)) * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)) * Vazir font ([License](https://github.com/rastikerdar/vazir-font/blob/master/LICENSE)) diff --git a/Telegram/ThirdParty/variant b/Telegram/ThirdParty/variant deleted file mode 160000 index 2370bb1e1b..0000000000 --- a/Telegram/ThirdParty/variant +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2370bb1e1b6ad54082e48cbe83adf94d6ba3d340 diff --git a/Telegram/lib_base b/Telegram/lib_base index 3f67c206af..1729480399 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 3f67c206afb85b4f5277b43db2768cb41daed245 +Subproject commit 1729480399aa34241b1a5bdacfdf284e041072dd