From: Yann Collet <cyan@fb.com>
Date: Thu, 2 Mar 2017 05:02:06 +0000 (-0800)
Subject: fixed : build zstd cli after libzstd
X-Git-Tag: v1.1.4~1^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78208bd8be0a7e19a066214c053f52534d2729f4;p=thirdparty%2Fzstd.git

fixed : build zstd cli after libzstd
---

diff --git a/programs/Makefile b/programs/Makefile
index db718d14c..407a4f374 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -24,7 +24,9 @@ else
 ALIGN_LOOP =
 endif
 
-CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress -I$(ZSTDDIR)/dictBuilder
+CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \
+           -I$(ZSTDDIR)/dictBuilder \
+           -DXXH_NAMESPACE=ZSTD_   # because xxhash.o already compiled with this macro from library
 CFLAGS  ?= -O3
 DEBUGFLAGS = -g -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
           -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \