From 3e8c205864a406daf17fcddf3f8dd9107269d682 Mon Sep 17 00:00:00 2001 From: powturbo Date: Wed, 8 Jul 2015 16:23:17 +0200 Subject: [PATCH] Makefile gcc / Clang / Mingw --- makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index 5003add..e7905b1 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,7 @@ MARCH=-march=native #MARCH=-msse2 -CFLAGS=-DNDEBUG -fstrict-aliasing -m64 $(MARCH) +CFLAGS=-DNDEBUG -fstrict-aliasing -m64 $(MARCH) -Iext UNAME := $(shell uname) ifeq ($(UNAME), Linux) @@ -40,10 +40,10 @@ SIMDCOMPD=ext/simdcomp/ SIMDCOMP=$(SIMDCOMPD)bitpacka.o $(SIMDCOMPD)src/simdintegratedbitpacking.o $(SIMDCOMPD)src/simdcomputil.o $(SIMDCOMPD)src/simdbitpacking.o #LIBFOR=ext/for/for.o +MVB=ext/MaskedVByte/src/varintencode.o ext/MaskedVByte/src/varintdecode.o # Lzturbo not included -#LZT=../lz/lz8c0.o ../lz/lz8d.o -#LZTB=../lz/lzbc0.o ../lz/lzbd.o +#LZT=../lz/lz8c0.o ../lz/lz8d.o ../lz/lzbc0.o ../lz/lzbd.o # blosc. Set the env. variable "EXT=blosc" to include #EXT=blosc @@ -54,13 +54,13 @@ LFLAGS+=-lpthread BLOSC=$(B)lz4hc.o $(B)c-blosc/blosc/blosc.o $(B)c-blosc/blosc/blosclz.o $(B)c-blosc/blosc/shuffle.o $(B)c-blosc/blosc/shuffle-generic.o $(B)c-blosc/blosc/shuffle-sse2.o endif -#LZ4=ext/lz4.o +LZ4=ext/lz4.o #ZLIB=-lz -MVB=ext/MaskedVByte/src/varintencode.o ext/MaskedVByte/src/varintdecode.o +#BSHUFFLE=ext/bitshuffle/src/bitshuffle.o -OBJS=icbench.o bitutil.o vint.o bitpack.o bitunpack.o eliasfano.o vsimple.o vp4dd.o vp4dc.o varintg8iu.o bitpackv.o bitunpackv.o $(TRANSP) ext/simple8b.o transpose.o $(BLOSC) $(SIMDCOMP) $(LIBFOR) $(LZT) $(LZTB) $(LZ4) $(MVB) $(ZLIB) +OBJS=icbench.o bitutil.o vint.o bitpack.o bitunpack.o eliasfano.o vsimple.o vp4dd.o vp4dc.o varintg8iu.o bitpackv.o bitunpackv.o $(TRANSP) ext/simple8b.o transpose.o $(BLOSC) $(SIMDCOMP) $(LIBFOR) $(LZT) $(LZ4) $(MVB) $(ZLIB) $(BSHUFFLE) icbench: $(OBJS) $(CC) $(OBJS) -lm -o icbench $(LFLAGS)