Adds LZ4 support by default if LZ4 is available
Simple makefile change + quick typename change Test: make clean make # successfully produces binary without lz4 support make clean # with flags to pick up my lz4 build make MOREFLAGS="-L/home/felixh/prog/lz4/lib -I/home/felixh/prog/lz4/lib" # successfully produces binary with lz4 support echo "TEST TEST TEST THIS IS A TEST STRING PLEASE TEST THIS PLEASE OK THANK YOU" | \ ./lz4/lz4 | \ LD_LIBRARY_PATH=/home/felixh/prog/lz4/lib ./zstd/zstd -d # successfully prints TEST TEST TEST THIS IS A TEST STRING PLEASE TEST THIS PLEASE OK THANK YOUdev
parent
14946af10c
commit
360238733a
|
@ -140,13 +140,10 @@ allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy
|
||||||
|
|
||||||
$(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
|
$(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
|
||||||
|
|
||||||
zstd zstd4 : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP)
|
zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
|
||||||
zstd zstd4 : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD)
|
zstd : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
|
||||||
zstd4 : CPPFLAGS += $(LZ4CPP)
|
zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
|
||||||
zstd4 : LDFLAGS += $(LZ4LD)
|
zstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
|
||||||
zstd : LZ4_MSG := - lz4 support is disabled
|
|
||||||
zstd zstd4 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
|
|
||||||
zstd zstd4 : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
|
|
||||||
@echo "$(THREAD_MSG)"
|
@echo "$(THREAD_MSG)"
|
||||||
@echo "$(ZLIB_MSG)"
|
@echo "$(ZLIB_MSG)"
|
||||||
@echo "$(LZMA_MSG)"
|
@echo "$(LZMA_MSG)"
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
|
|
||||||
#define LZ4_MAGICNUMBER 0x184D2204
|
#define LZ4_MAGICNUMBER 0x184D2204
|
||||||
#if defined(ZSTD_LZ4COMPRESS) || defined(ZSTD_LZ4DECOMPRESS)
|
#if defined(ZSTD_LZ4COMPRESS) || defined(ZSTD_LZ4DECOMPRESS)
|
||||||
|
# define LZ4F_ENABLE_OBSOLETE_ENUMS
|
||||||
# include <lz4frame.h>
|
# include <lz4frame.h>
|
||||||
# include <lz4.h>
|
# include <lz4.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue