From ac3d5ac769be0fda7a25cf5ad04bb4da999e5a82 Mon Sep 17 00:00:00 2001 From: Thomas A Date: Sun, 26 Feb 2023 21:12:57 -0800 Subject: [PATCH] Fix Building For zip-18 --- CMakeLists.txt | 2 +- unzip/unzip60/CMakeLists.txt | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b36eede..eb56aac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ project(zip_parent) add_subdirectory(zip/zip30) -add_subdirectory(unzip/unzip-5.52) +add_subdirectory(unzip/unzip60) diff --git a/unzip/unzip60/CMakeLists.txt b/unzip/unzip60/CMakeLists.txt index d3e9ea6..67c88e4 100644 --- a/unzip/unzip60/CMakeLists.txt +++ b/unzip/unzip60/CMakeLists.txt @@ -7,7 +7,7 @@ if(COMMAND cmake_policy) endif(COMMAND cmake_policy) include(darling_exe) -add_definitions(-DUNIX -DUNICODE_SUPPORT -DCRYPT -DUSE_ZLIB) +add_definitions(-DUNIX -DUNICODE_SUPPORT -DCRYPT -DLARGE_FILE_SUPPORT -DBSD) # Hide warnings add_definitions( @@ -26,25 +26,23 @@ set(BINARY_PACKAGING_MODE ON) set(unzip_sources crc32.c + crypt.c envargs.c explode.c + extract.c + fileio.c globals.c inflate.c + list.c match.c - timezone.c + process.c ttyio.c + ubz2err.c + unix/unix.c unreduce.c unshrink.c - list.c - extract.c - crypt.c - unix/unix.c - fileio.c - zipinfo.c - process.c unzip.c - crypt.c - crctab.c + zipinfo.c ) add_darling_executable(unzip ${unzip_sources}) @@ -65,7 +63,7 @@ set_target_properties(funzip PROPERTIES COMPILE_FLAGS "-DFUNZIP") set(unzipsfx_sources unzip.c - crctab.c + crc32.c crypt.c extract.c fileio.c @@ -74,6 +72,7 @@ set(unzipsfx_sources match.c process.c ttyio.c + ubz2err.c unix/unix.c )