diff --git a/.travis.yml b/.travis.yml index e92347b..bab75cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,10 +65,11 @@ script: octave-cli --eval "addpath(pwd);cd test;run_zmat_test"; fi - ${MAKE} -C src lib + - ${MAKE} -C example/c static + - ${MAKE} -C src dll - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - ls -lt lib; - cp lib/*.dll example/c; + cp lib/* example/c; fi - ${MAKE} -C example/c all - if [ "$TRAVIS_OS_NAME" = "osx" ]; then diff --git a/example/c/Makefile b/example/c/Makefile index 9706b87..bd3834b 100644 --- a/example/c/Makefile +++ b/example/c/Makefile @@ -1,4 +1,6 @@ +LIBTYPE ?= dynamic + all: - $(CC) -g -Wall -pedantic testzmat.c -o testzmat -I../../include -L../../lib -lzmat -lz -lpthread + $(CC) -g -Wall -pedantic testzmat.c -o testzmat -I../../include -L../../lib -Wl,-B$(LIBTYPE) -lzmat -Wl,-Bdynamic -lz -lpthread clean: -rm -f testzmat diff --git a/example/c/testzmat.c b/example/c/testzmat.c index 789f1f5..42337d7 100644 --- a/example/c/testzmat.c +++ b/example/c/testzmat.c @@ -15,9 +15,8 @@ #include /** - * if only zlib/gzip/base64 is used, one only need to add -I/path/to/zmatlib.h - * if lzma/lzip is used, one must add -I/path/to/src/easylzma/ - * if lz4/lz4hc is used, one must add -I/path/to/src/lz4 + * to compile, one should add -I/path/to/zmatlib.h to the compilation command and + * -L/path/to/libzmat.so(or .a) -lzmat -lz -lpthread to the linking command */ #include "zmatlib.h" diff --git a/src/Makefile b/src/Makefile index f75067f..b3d6f54 100644 --- a/src/Makefile +++ b/src/Makefile @@ -100,7 +100,7 @@ ifeq ($(MAKECMDGOALS),lib) ARFLAGS :=cr BINARY :=libzmat.a AROUTPUT := - LINKOPT := + LINKOPT :=blosc2/lib/libblosc2.a blosc2/internal-complibs/zstd-1.5.2/libzstd.a OUTPUT_DIR :=$(LIBDIR) ifeq ($(findstring Darwin,$(PLATFORM)), Darwin) OUTPUTFLAG :=