Remove zlibwapi

README.md

@@ -284,9 +284,8 @@ Library specific options:
  VORBIS_LIBRARY - Only if building with sound; path to libvorbis.a/libvorbis.so/libvorbis.dll.a
  XXF86VM_LIBRARY - Only on Linux; path to libXXf86vm.a/libXXf86vm.so
  ZLIB_DLL - Only on Windows; path to zlib1.dll
- ZLIBWAPI_DLL - Only on Windows; path to zlibwapi.dll
  ZLIB_INCLUDE_DIR - Directory that contains zlib.h
- ZLIB_LIBRARY - Path to libz.a/libz.so/zlibwapi.lib
+ ZLIB_LIBRARY - Path to libz.a/libz.so/zlib.lib
 
 ### Compiling on Windows
 

src/CMakeLists.txt

@@ -694,12 +694,6 @@ else()
  set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
  endif()
 
- if(WIN32 AND NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
- message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
- " isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")
- endif()
-
  if(MINGW)
  set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN")
@@ -767,9 +761,6 @@ if(WIN32)
  if(ZLIB_DLL)
  install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
  endif()
- if(ZLIBWAPI_DLL)
- install(FILES ${ZLIBWAPI_DLL} DESTINATION ${BINDIR})
- endif()
  if(FREETYPE_DLL)
  install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
  endif()

src/serialization.cpp

@@ -20,9 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 
 #include "util/serialize.h"
-#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI)
- #define ZLIB_WINAPI
-#endif
+
 #include "zlib.h"
 
 /* report a zlib or i/o error */