diff options
| author | sfan5 <sfan5@live.de> | 2016-09-20 21:40:05 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2016-09-21 20:16:31 +0200 |
| commit | af4c2107e0e893077deaec7b068b2e4e3e6932c6 (patch) | |
| tree | c4bacaa6229370fd189ee95c43c96aa14bb4ef25 /src/serialization.cpp | |
| parent | 3a57e525009ade2aa039b0bab33e4b10eda36bf4 (diff) | |
| download | minetest-af4c2107e0e893077deaec7b068b2e4e3e6932c6.tar.gz minetest-af4c2107e0e893077deaec7b068b2e4e3e6932c6.tar.bz2 minetest-af4c2107e0e893077deaec7b068b2e4e3e6932c6.zip | |
Don't use ZLIB_WINAPI if the required DLL is not provided to CMake
This allows you to use an stdcall zlib (zlib1.dll instead of zlibwapi.dll)
when building Minetest for win32.
Diffstat (limited to 'src/serialization.cpp')
| -rw-r--r-- | src/serialization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialization.cpp b/src/serialization.cpp index 79f66fcae..d30e83726 100644 --- a/src/serialization.cpp +++ b/src/serialization.cpp @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "serialization.h" #include "util/serialize.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI) #define ZLIB_WINAPI #endif #include "zlib.h" |