From 0cdfbd99e5ee8503110a9b4e5c784b28b295b8e1 Mon Sep 17 00:00:00 2001 From: x Date: Tue, 16 May 2023 12:06:36 +0200 Subject: [PATCH] External libs makefile --- lib/libext.mak | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/libext.mak b/lib/libext.mak index d057e12..5005ef7 100644 --- a/lib/libext.mak +++ b/lib/libext.mak @@ -8,12 +8,13 @@ CXXFLAGS+=$(_SSE) -I$(LB)FastPFor/headers -std=gnu99 -DUSE_THREADS ifeq ($(ICCODEC),1) LZ4=1 ZSTD=1 -#FSE=1 -#FSEHUF=1 +FSE=1 +FSEHUF=1 #ZLIB=1 BITSHUFFLE=1 #LZTURBO=1 TURBORC=1 +ANS=1 endif ifeq ($(CODEC1),1) @@ -180,7 +181,7 @@ endif ifeq ($(LZTURBO),1) CFLAGS+=-D_LZTURBO LDFLAGS+=-lpthread -include lzturbo.mak +include lib/lzturbo.mak endif ifeq ($(MASKEDVBYTE),1) @@ -266,8 +267,22 @@ endif ifeq ($(TURBORC), 1) -CFLAGS+=-D_TURBORC +CFLAGS+=-D_TURBORC -I$(T)libsais/include -D_NCPUISA T=$(LB)Turbo-Range-Coder/ +ifeq ($(ANS), 1) +CFLAGS+=-D_ANS +$(T)anscdf0.o: $(T)anscdf.c $(T)anscdf_.h + $(CC) -c -O3 $(CFLAGS) -mno-sse2 -falign-loops=32 $(T)anscdf.c -o $(T)anscdf0.o + +$(T)anscdfs.o: $(T)anscdf.c $(T)anscdf_.h + $(CC) -c -O3 $(CFLAGS) -D_NDIVTDEF32 -march=corei7-avx -mtune=corei7-avx -mno-aes -falign-loops=32 $(T)anscdf.c -o $(T)anscdfs.o + +$(T)anscdfx.o: $(T)anscdf.c $(T)anscdf_.h + $(CC) -c -O3 $(CFLAGS) -march=haswell -falign-loops=32 $(T)anscdf.c -o $(T)anscdfx.o + +OB+=$(T)anscdfx.o $(T)anscdfs.o $(T)anscdf0.o +endif + OB+=$(T)rc_s.o $(T)rc_ss.o $(T)rcutil.o $(T)libsais/src/libsais.o $(T)rccm_s.o $(T)rccm_ss.o $(T)bec_b.o $(T)rcqlfc_s.o $(T)rcqlfc_ss.o $(T)rcbwt.o endif @@ -305,8 +320,10 @@ ifeq ($(ZSTD), 1) CFLAGS+=-D_ZSTD -I$(LB)zstd/lib -I$(LB)zstd/lib/common OB+=$(LB)zstd/lib/common/pool.o $(LB)zstd/lib/common/xxhash.o $(LB)zstd/lib/common/error_private.o \ $(LB)zstd/lib/compress/hist.o $(LB)zstd/lib/compress/zstd_compress.o $(LB)zstd/lib/compress/zstd_compress_literals.o $(LB)zstd/lib/compress/zstd_compress_sequences.o $(LB)zstd/lib/compress/zstd_double_fast.o $(LB)zstd/lib/compress/zstd_fast.o $(LB)zstd/lib/compress/zstd_lazy.o $(LB)zstd/lib/compress/zstd_ldm.o $(LB)zstd/lib/compress/zstdmt_compress.o $(LB)zstd/lib/compress/zstd_opt.o \ - $(LB)zstd/lib/decompress/zstd_decompress.o $(LB)zstd/lib/decompress/zstd_decompress_block.o $(LB)zstd/lib/decompress/zstd_ddict.o $(LB)zstd/lib/compress/fse_compress.o $(LB)zstd/lib/common/fse_decompress.o $(LB)zstd/lib/compress/huf_compress.o $(LB)zstd/lib/decompress/huf_decompress.o $(LB)zstd/lib/common/zstd_common.o $(LB)zstd/lib/common/entropy_common.o $(LB)zstd/lib/compress/zstd_compress_superblock.o\ + $(LB)zstd/lib/decompress/zstd_decompress.o $(LB)zstd/lib/decompress/zstd_decompress_block.o $(LB)zstd/lib/decompress/zstd_ddict.o $(LB)zstd/lib/compress/fse_compress.o $(LB)zstd/lib/common/fse_decompress.o \ + $(LB)zstd/lib/common/zstd_common.o $(LB)zstd/lib/common/entropy_common.o $(LB)zstd/lib/compress/zstd_compress_superblock.o\ $(LB)zstd/lib/decompress/huf_decompress_amd64.o $(LB)zstd/lib/dictBuilder/zdict.o $(LB)zstd/lib/dictBuilder/fastcover.o $(LB)zstd/lib/dictBuilder/cover.o $(LB)zstd/lib/dictBuilder/divsufsort.o +#$(LB)zstd/lib/compress/huf_compress.o $(LB)zstd/lib/decompress/huf_decompress.o endif ifeq ($(FSE), 1) @@ -316,6 +333,7 @@ endif ifeq ($(FSEHUF), 1) CFLAGS+=-D_FSEHUF +OB+=$(LB)fse/huf_compress_.o $(LB)fse/huf_decompress_.o endif ifeq ($(ZFP), 1)