use miniz by default, rename zstd folder name

NeuroJSON · Oct 13, 2023 · f4408f6 · f4408f6
1 parent fcaa396
commit f4408f6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -11,7 +11,7 @@ ZMATDIR ?=$(ROOTDIR)
 LIBDIR  ?=$(ROOTDIR)/lib
 
 MKDIR      :=mkdir
-HAVE_ZLIB  ?=yes
+HAVE_ZLIB  ?=miniz
 HAVE_LZMA  ?=yes
 HAVE_LZ4   ?=yes
 HAVE_ZSTD  ?=yes
@@ -66,8 +66,8 @@ else
   endif
 endif
 
-ifeq ($(HAVE_ZLIB),no)
-  CFLAGS+=-DNO_ZLIB
+ifneq ($(HAVE_ZLIB),yes)
+  CFLAGS+=-DNO_ZLIB -D_LARGEFILE64_SOURCE=1
   INCLUDEDIRS+=-Iminiz
   FILES+=miniz/miniz
   LIBZLIB=
@@ -92,8 +92,8 @@ else
     FILES+= lz4/lz4 lz4/lz4hc
   endif
   ifeq ($(HAVE_ZSTD),no)
-    INCLUDEDIRS+=-Iblosc2/internal-complibs/zstd-1.5.2
-    LIBZLIB+=-Lblosc2/internal-complibs/zstd-1.5.2 -lzstd
+    INCLUDEDIRS+=-Iblosc2/internal-complibs/zstd
+    LIBZLIB+=-Lblosc2/internal-complibs/zstd -lzstd
   endif
   LIBZLIB+=-Lblosc2/lib -lblosc2 -pthread -lz
   INCLUDEDIRS+=-Iblosc2/include
@@ -109,8 +109,8 @@ endif
 ifeq ($(HAVE_ZSTD),no)
   CFLAGS+=-DNO_ZSTD
 else
-  INCLUDEDIRS+=-Iblosc2/internal-complibs/zstd-1.5.2
-  LIBZLIB+=-Lblosc2/internal-complibs/zstd-1.5.2 -lzstd
+  INCLUDEDIRS+=-Iblosc2/internal-complibs/zstd
+  LIBZLIB+=-Lblosc2/internal-complibs/zstd -lzstd
 endif
 
 
@@ -119,7 +119,7 @@ ifeq ($(MAKECMDGOALS),lib)
    ARFLAGS    :=cr
    BINARY     :=libzmat.a
    AROUTPUT   :=
-   LINKOPT    :=blosc2/blosc/*$(OBJSUFFIX) blosc2/internal-complibs/zstd-1.5.2/obj/*/static/*$(OBJSUFFIX)
+   LINKOPT    :=blosc2/blosc/*$(OBJSUFFIX) blosc2/internal-complibs/zstd/obj/*/static/*$(OBJSUFFIX)
    OUTPUT_DIR :=$(LIBDIR)
    ifeq ($(findstring Darwin,$(PLATFORM)), Darwin)
       OUTPUTFLAG :=

diff --git a/src/blosc2/Makefile b/src/blosc2/Makefile
@@ -3,7 +3,7 @@
 ############################################################
 
 BLOSC_SRC=blosc
-ZSTD_SRC=internal-complibs/zstd-1.5.2
+ZSTD_SRC=internal-complibs/zstd
 LIBBLOSC2=$(BLOSC_SRC)/lib/libblosc2.a
 
 export

diff --git a/src/blosc2/blosc/CMakeLists.txt b/src/blosc2/blosc/CMakeLists.txt
@@ -32,7 +32,7 @@ if(NOT DEACTIVATE_ZSTD)
     if(ZSTD_FOUND)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR})
     else()
-        set(ZSTD_LOCAL_DIR ${INTERNAL_LIBS}/zstd-1.5.2)
+        set(ZSTD_LOCAL_DIR ${INTERNAL_LIBS}/zstd)
         set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZSTD_LOCAL_DIR}
                 ${ZSTD_LOCAL_DIR}/common)
     endif()

diff --git a/src/blosc2/blosc/Makefile b/src/blosc2/blosc/Makefile
@@ -23,7 +23,12 @@ DOXY       := doxygen
 DOCDIR     := $(ZMATDIR)/doc
 DOXYCFG=zmat.cfg
 
-INCLUDEDIRS=-I../../lz4 -I../include -I../internal-complibs/zstd-1.5.2
+INCLUDEDIRS=-I../../lz4 -I../include -I../internal-complibs/zstd
+
+ifeq ($(HAVE_ZLIB),miniz)
+  HAVE_ZLIB=yes
+  INCLUDEDIRS+=-I../../miniz
+endif
 
 CUOMPLINK=