From aa3ca94de45328fb52fd00d2cc4d698e540c37cc Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Tue, 23 May 2023 17:15:47 -0700
Subject: [PATCH] fix paths

---
 CMakeLists.txt                    | 6 +++---
 depends/zlib/lib/win32/.gitignore | 1 -
 depends/zlib/lib/win64/.gitignore | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 depends/zlib/lib/win32/.gitignore
 delete mode 100644 depends/zlib/lib/win64/.gitignore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56cfa0b95..50ac8f183 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,12 +271,12 @@ set(Python_FIND_UNVERSIONED_NAMES FIRST)
 include(CMake/DownloadFile.cmake)
 
 if(WIN32)
-    set(ZLIB_FILE win64-zlib.lib)
+    set(ZLIB_FILE zlib.lib)
     set(ZLIB_PATH ${CMAKE_BINARY_DIR}/depends/zlib/)
     set(ZLIB_MD5 a3b2fc6b68efafa89b0882e354fc8418)
     file(COPY ${dfhack_SOURCE_DIR}/depends/zlib/ DESTINATION ${ZLIB_PATH})
-    download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/${ZLIB_FILE}"
-        ${ZLIB_PATH}${ZLIB_FILE}
+    download_file("https://github.com/DFHack/dfhack-bin/releases/download/0.44.09/win64-${ZLIB_FILE}"
+        ${ZLIB_PATH}lib/${ZLIB_FILE}
         ${ZLIB_MD5})
     set(ZLIB_ROOT ${ZLIB_PATH})
 else()
diff --git a/depends/zlib/lib/win32/.gitignore b/depends/zlib/lib/win32/.gitignore
deleted file mode 100644
index 683bf139f..000000000
--- a/depends/zlib/lib/win32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lib
diff --git a/depends/zlib/lib/win64/.gitignore b/depends/zlib/lib/win64/.gitignore
deleted file mode 100644
index 683bf139f..000000000
--- a/depends/zlib/lib/win64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lib