Fix build with external minizip.

AlirezaHedayatfar · Mar 13, 2020 · 1df1b9f · 1df1b9f
1 parent 854bc9f
commit 1df1b9f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -7,10 +7,11 @@ For license and copyright information please follow this link:
 */
 #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
+30 −21		external/CMakeLists.txt
+44 −0		external/minizip/CMakeLists.txt
+57 −0		external/ton/CMakeLists.txt
+0 −35		external/zlib/CMakeLists.txt
+1 −0		options_win.cmake
+0 −2		variables.cmake