diff --git a/CMakeLists.txt b/CMakeLists.txt index d427ad0594..645d886a04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ project(Telegram ) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram) +get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH) +get_filename_component(submodules_loc "Telegram" REALPATH) + include(cmake/variables.cmake) include(cmake/nice_target_sources.cmake) include(cmake/target_link_static_libraries.cmake) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 1a3e0bc154..b7be40f6b0 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -94,6 +94,7 @@ PRIVATE desktop-app::external_lz4 desktop-app::external_rlottie desktop-app::external_zlib + desktop-app::external_minizip desktop-app::external_qt desktop-app::external_qr_code_generator desktop-app::external_crash_reports diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_dump_to_text.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_dump_to_text.cpp index 2ec424f6c6..088fc015a5 100644 --- a/Telegram/SourceFiles/mtproto/details/mtproto_dump_to_text.cpp +++ b/Telegram/SourceFiles/mtproto/details/mtproto_dump_to_text.cpp @@ -7,10 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "mtproto/details/mtproto_dump_to_text.h" -#include "base/zlib_help.h" #include "scheme-dump_to_text.h" #include "scheme.h" +#include "zlib.h" + namespace MTP::details { bool DumpToTextCore(DumpToTextBuffer &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons, uint32 level, mtpPrime vcons) { diff --git a/cmake b/cmake index 81e27ccc0e..ce1b017f35 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 81e27ccc0e7bf27405569ce98582860dfc9ea9bb +Subproject commit ce1b017f3527c3bfc8283eaf2439ed0eb72ecd8b