Merge pull request #3 from miller-alex/more-fixes

More improvements

Author: 0-wiz-0

COPYING

@@ -1,3 +1,12 @@
+# unreleased
+
+* fix a build error on windows
+* improve log file handling
+* add -e and -l options to set (or disable) error log file and logging directory
+* revert zip64 format changes from last release
+* update included source for minizip to version from zlib-1.3.1
+* various fixes and code cleanup
+
 # 1.1 [2024-01-16]
 
 * zip64 format: zip64 EOCD was missing in some cases
@@ -11,7 +20,7 @@
 * various other fixes
 
 Thanks to our new contributor:
-* @miller-alex
+* Alexander Miller
 
 # 1.0.0 [2022-06-18]
 

GPL2.txt

@@ -1,7 +1,6 @@
-file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/contrib/*.c)
+file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/minizip/*.c)
 add_executable(trrntzip ${SOURCES})
 target_compile_definitions(trrntzip PRIVATE "TZ_VERSION=\"${PROJECT_VERSION}\"")
-target_include_directories(trrntzip BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/contrib)
 target_link_libraries(trrntzip m ZLIB::ZLIB)
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/contrib/unzip.c APPEND PROPERTY COMPILE_DEFINITIONS UNZ_MAXFILENAMEINZIP=1024)
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/minizip/unzip.c APPEND PROPERTY COMPILE_DEFINITIONS UNZ_MAXFILENAMEINZIP=1024)
 install(TARGETS trrntzip EXPORT ${PROJECT_NAME}-targets DESTINATION bin)