diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 651276415..a90315e05 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -537,8 +537,8 @@ list(APPEND THIRD_PARTY_SRC ThirdParty/emoji_suggestions/emoji_suggestions.cpp ) -include_directories(ThirdParty/minizip) +include_directories(ThirdParty) # For minizip/ but we use fully-qualified include path to avoid ambiguity include_directories(ThirdParty/GSL/include ThirdParty/variant/include ThirdParty/emoji_suggestions ThirdParty/libtgvoip) diff --git a/Telegram/SourceFiles/base/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h index 1aad0ea46..682cbc83d 100644 --- a/Telegram/SourceFiles/base/zlib_help.h +++ b/Telegram/SourceFiles/base/zlib_help.h @@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "zip.h" -#include "unzip.h" +#include "minizip/zip.h" +#include "minizip/unzip.h" namespace zlib { namespace internal { diff --git a/Telegram/ThirdParty/minizip/unzip.c b/Telegram/ThirdParty/minizip/unzip.c index 909350435..801c00cad 100644 --- a/Telegram/ThirdParty/minizip/unzip.c +++ b/Telegram/ThirdParty/minizip/unzip.c @@ -73,7 +73,7 @@ #endif #include "zlib.h" -#include "unzip.h" +#include "minizip/unzip.h" #ifdef STDC # include diff --git a/Telegram/ThirdParty/minizip/zip.c b/Telegram/ThirdParty/minizip/zip.c index d1a31dd28..33f3c0f95 100644 --- a/Telegram/ThirdParty/minizip/zip.c +++ b/Telegram/ThirdParty/minizip/zip.c @@ -27,7 +27,7 @@ #include #include #include "zlib.h" -#include "zip.h" +#include "minizip/zip.h" #ifdef STDC # include