c/xlsxio
1
0
Fork 0
mirror of https://github.com/brechtsanders/xlsxio synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build with minizip-ng instead of minizip or libzip

Browse Source 
https://github.com/zlib-ng/minizip-ng
This commit is contained in:
Jörg Bakker 2022-11-01 17:51:14 +01:00
parent 47fd7b9640
commit 59fc5b0a0f
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -22,6 +22,7 @@ OPTION(BUILD_PC_FILES "Build pkg-config .pc" ON)
OPTION(BUILD_TOOLS "Build tools" ON) OPTION(BUILD_TOOLS "Build tools" ON)
OPTION(BUILD_EXAMPLES "Build examples" ON) OPTION(BUILD_EXAMPLES "Build examples" ON)
OPTION(WITH_LIBZIP "Use libzip instead of Minizip" OFF) OPTION(WITH_LIBZIP "Use libzip instead of Minizip" OFF)
OPTION(WITH_MINIZIP_NG "Use Minizip NG" OFF)
OPTION(WITH_WIDE "Also build UTF-16 library (libxlsxio_readw)" OFF) OPTION(WITH_WIDE "Also build UTF-16 library (libxlsxio_readw)" OFF)
SET(ZLIB_DIR "" CACHE PATH "Path to the zlib library") SET(ZLIB_DIR "" CACHE PATH "Path to the zlib library")
IF(WITH_LIBZIP) IF(WITH_LIBZIP)
@ -50,10 +51,19 @@ IF(WITH_LIBZIP)
SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES})
SET(ANYZIP_DEF USE_LIBZIP) SET(ANYZIP_DEF USE_LIBZIP)
ELSE() ELSE()
FIND_PACKAGE(Minizip REQUIRED) SET(USE_MINIZIP)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) ADD_DEFINITIONS(-DUSE_MINIZIP)
SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) SET(ANYZIP_DEF)
SET(ANYZIP_DEF USE_MINIZIP) IF(WITH_MINIZIP_NG)
FIND_PACKAGE(minizip REQUIRED)
SET(USE_MINIZIP_NG)
ADD_DEFINITIONS(-DUSE_MINIZIP_NG)
SET(ANYZIP_LIBRARIES MINIZIP::minizip)
ELSE()
FIND_PACKAGE(Minizip REQUIRED)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
ENDIF()
ENDIF() ENDIF()
# dependancy: expat # dependancy: expat
IF(EXPAT_DIR) IF(EXPAT_DIR)

14
lib/xlsxio_read.c
View File

@ -8,8 +8,12 @@
#include <string.h> #include <string.h>
#include <expat.h> #include <expat.h>
#ifdef USE_MINIZIP #if (defined(USE_MINIZIP)) || (defined(USE_MINIZIP_NG))
# include <minizip/unzip.h> # ifdef USE_MINIZIP_NG
# include <mz_compat.h>
# else
# include <minizip/unzip.h>
# endif
# define ZIPFILETYPE unzFile # define ZIPFILETYPE unzFile
# define ZIPFILEENTRYTYPE unzFile # define ZIPFILEENTRYTYPE unzFile
# if defined(_MSC_VER) # if defined(_MSC_VER)
@ -21,15 +25,15 @@
# define IOSIZETYPE ssize_t # define IOSIZETYPE ssize_t
# define IOFN(fn) fn # define IOFN(fn) fn
# endif # endif
/*
# if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) // support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED # if defined(MZ_COMPRESS_METHOD_DEFLATE) // support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED
# ifndef ZCALLBACK # ifndef ZCALLBACK
# define ZCALLBACK # define ZCALLBACK
# endif # endif
# define voidpf void* # define voidpf void*
# define uLong unsigned long # define uLong unsigned long
# endif # endif
*/
#else #else
# if (defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL) && !defined(BUILD_XLSXIO_SHARED))) && !defined(ZIP_STATIC) # if (defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL) && !defined(BUILD_XLSXIO_SHARED))) && !defined(ZIP_STATIC)
# define ZIP_STATIC # define ZIP_STATIC

11
lib/xlsxio_write.c
View File

@ -11,12 +11,19 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#ifdef USE_MINIZIP #if (defined(USE_MINIZIP)) || (defined(USE_MINIZIP_NG))
# include <minizip/zip.h> # ifdef USE_MINIZIP_NG
# include <mz_compat.h>
# else
# include <minizip/unzip.h>
# endif
# if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) /* support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED */ # if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) /* support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED */
# define Z_DEFLATED MZ_COMPRESS_METHOD_DEFLATE # define Z_DEFLATED MZ_COMPRESS_METHOD_DEFLATE
# endif # endif
# define ZIPFILETYPE zipFile # define ZIPFILETYPE zipFile
#elif USE_MINIZIP_NG
# include <mz_compat.h>
# define ZIPFILETYPE zipFile
#else #else
# if (defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL) && !defined(BUILD_XLSXIO_SHARED))) && !defined(ZIP_STATIC) # if (defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL) && !defined(BUILD_XLSXIO_SHARED))) && !defined(ZIP_STATIC)
# define ZIP_STATIC # define ZIP_STATIC