From 2b732d72c8a19a5c9f5679b5944e3dd7f7a282c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Noel?= Date: Mon, 24 Feb 2025 10:20:48 +0100 Subject: [PATCH] fix zlib include --- Sources/CMakeLists.txt | 2 ++ Sources/Engine/Base/Unzip.cpp | 2 +- Sources/Engine/Network/Compression.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 72a25a5..87889fd 100755 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -59,6 +59,8 @@ if(USE_SYSTEM_ZLIB) else() message(FATAL_ERROR "Error! USE_SYSTEM_ZLIB is set but neccessary developer files are missing") endif() +else() + include_directories(${CMAKE_SOURCE_DIR}/Engine/zlib) endif() # RAKE! Where to install the binaries. diff --git a/Sources/Engine/Base/Unzip.cpp b/Sources/Engine/Base/Unzip.cpp index 042a30f..a76bb57 100644 --- a/Sources/Engine/Base/Unzip.cpp +++ b/Sources/Engine/Base/Unzip.cpp @@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., typedef unsigned char Byte; // !!! FIXME: not sure why I suddenly needed this typedef here. #endif -#include +#include extern CTCriticalSection zip_csLock; // critical section for access to zlib functions #pragma pack(1) diff --git a/Sources/Engine/Network/Compression.cpp b/Sources/Engine/Network/Compression.cpp index fe788a3..509744c 100644 --- a/Sources/Engine/Network/Compression.cpp +++ b/Sources/Engine/Network/Compression.cpp @@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include +#include extern CTCriticalSection zip_csLock; // critical section for access to zlib functions