unzip: Link against real zlib.

Author: Nakhr11n

.github/workflows/build.yml

@@ -57,12 +57,13 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y --no-install-recommends \
-            ninja-build cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev
+            ninja-build cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev zlib1g-dev
 
       - name: Configure CMake
         env:
           CC: ${{ matrix.os.cc }}
           CXX: ${{ matrix.os.cxx }}
+          VCPKG_ROOT: C:/vcpkg
         run: cmake --preset ${{ matrix.os.preset }}
 
       - name: Debug Build

Brewfile

@@ -10,3 +10,6 @@ brew "sdl2_image"
 
 brew "cmake"
 brew "ninja"
+
+# zlib
+brew "zlib"

CMakeLists.txt

@@ -104,6 +104,8 @@ if(LOGGER)
   add_definitions(-DLOGGER)
 endif()
 
+find_package(ZLIB REQUIRED)
+
 include_directories("lib" "Descent3" ${PLATFORM_INCLUDES})
 
 # file(GLOB_RECURSE INCS "*.h")

CMakePresets.json

@@ -15,7 +15,8 @@
 				"lhs": "${hostSystemName}",
 				"rhs": "Windows"
 			},
-			"architecture": "Win32"
+			"architecture": "Win32",
+			"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
 		},
 		{
 			"name": "mac",

README.md

@@ -25,7 +25,7 @@ Back up your `Descent3` binary and drop your built `Descent3` binary into the in
 Build steps below assume you have already cloned the repository and entered it locally.
 
 #### Building - Windows
-Requires Visual Studio C++ Tools (cmake and nmake)
+Requires Visual Studio C++ Tools (cmake and vcpkg)
 ```sh
 cmake --preset win
 cmake --build --preset win --config [Debug/Release] -D LOGGER=[ON|OFF]
@@ -42,7 +42,7 @@ cmake --build --preset mac --config [Debug/Release] -D LOGGER=[ON|OFF]
 ```sh
 sudo dpkg --add-architecture i386
 sudo apt update
-sudo apt install -y --no-install-recommends ninja-build cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev libxext6:i386
+sudo apt install -y --no-install-recommends ninja-build cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev libxext6:i386 zlib1g-dev
 cmake --preset linux
 cmake --build --preset linux --config [Debug/Release] -D LOGGER=[ON|OFF]
 ```

unzip/CMakeLists.txt

@@ -1,21 +1,6 @@
-set(HEADERS
-  infblock.h
-  infcodes.h
-  inffast.h
-  inffixed.h
-  inftrees.h
-  infutil.h
-  zconf.h
-  zlib.h
-  zutil.h)
-set(CPPS
-  unzip.cpp
-  adler32.c
-  infblock.c
-  infcodes.c
-  inffast.c
-  inflate.c
-  inftrees.c
-  infutil.c)
+set(HEADERS)
+set(CPPS unzip.cpp)
 
 add_library(unzip STATIC ${HEADERS} ${CPPS})
+
+target_link_libraries(unzip ZLIB::ZLIB)