From af4c2107e0e893077deaec7b068b2e4e3e6932c6 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 20 Sep 2016 21:40:05 +0200 Subject: 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. --- src/serialization.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/serialization.cpp') 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" -- cgit v1.2.3