exclude zbuff_compress.c and zbuff_decompress.c

diff --git a/build/VS2008/fullbench/fullbench.vcproj b/build/VS2008/fullbench/fullbench.vcproj
index 8fe4f109ce3651f68ec914dce7fdc0f89707816d..0734219b4e4d6459783cfe3a8e37ac44bdc4ad58 100644 (file)
--- a/build/VS2008/fullbench/fullbench.vcproj
+++ b/build/VS2008/fullbench/fullbench.vcproj
@@ -364,14 +364,6 @@
                                RelativePath="..\..\..\lib\decompress\huf_decompress.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\compress\zbuff_compress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\lib\decompress\zbuff_decompress.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\common\zstd_common.c"
                                >
@@ -426,10 +418,6 @@
                                RelativePath="..\..\..\lib\common\mem.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff_static.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\zstd.h"
                                >

diff --git a/build/VS2008/fuzzer/fuzzer.vcproj b/build/VS2008/fuzzer/fuzzer.vcproj
index 3644b8c753958babc7d8e289127e03c19f991493..311b799091901fd336f7e52d4935cc78ac4edea2 100644 (file)
--- a/build/VS2008/fuzzer/fuzzer.vcproj
+++ b/build/VS2008/fuzzer/fuzzer.vcproj
@@ -430,10 +430,6 @@
                                RelativePath="..\..\..\lib\common\xxhash.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff_static.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\dictBuilder\zdict.h"
                                >

diff --git a/build/VS2008/zstd/zstd.vcproj b/build/VS2008/zstd/zstd.vcproj
index 1d51f51cfde55e13087c61d6c6cd86eacf0f114d..ad64f8696c6d6aea01474ccc77af302445a46e46 100644 (file)
--- a/build/VS2008/zstd/zstd.vcproj
+++ b/build/VS2008/zstd/zstd.vcproj
@@ -380,14 +380,6 @@
                                RelativePath="..\..\..\lib\common\xxhash.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\compress\zbuff_compress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\lib\decompress\zbuff_decompress.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\dictBuilder\zdict.c"
                                >
@@ -482,14 +474,6 @@
                                RelativePath="..\..\..\lib\common\xxhash.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff_static.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\dictBuilder\zdict.h"
                                >

diff --git a/build/VS2008/zstdlib/zstdlib.vcproj b/build/VS2008/zstdlib/zstdlib.vcproj
index 9c61e94941d6c7df6275584e41c99522156c4a7c..b1c103e328d3bab6a944b1d1f9214f2ce1fe20e4 100644 (file)
--- a/build/VS2008/zstdlib/zstdlib.vcproj
+++ b/build/VS2008/zstdlib/zstdlib.vcproj
@@ -360,14 +360,6 @@
                                RelativePath="..\..\..\lib\common\xxhash.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\compress\zbuff_compress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\lib\decompress\zbuff_decompress.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\dictBuilder\zdict.c"
                                >
@@ -458,14 +450,6 @@
                                RelativePath="..\..\..\lib\common\xxhash.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\lib\common\zbuff_static.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\..\lib\dictBuilder\zdict.h"
                                >

diff --git a/lib/Makefile b/lib/Makefile
index 681c048c63066ecf62393d6ce5e82daa63f25b65..8f316aa68090e7199a2cd55c52b8aa4d5c493354 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -31,7 +31,10 @@ CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
 FLAGS   = $(CPPFLAGS) $(CFLAGS) $(MOREFLAGS)
 
 
-ZSTD_FILES := common/*.c compress/*.c decompress/*.c dictBuilder/*.c
+ZSTD_FILES := $(wildcard common/*.c compress/*.c decompress/*.c dictBuilder/*.c)
+ZSTD_EXCLUDE := compress/zbuff_compress.c decompress/zbuff_decompress.c
+ZSTD_FILES := $(filter-out $(ZSTD_EXCLUDE), $(ZSTD_FILES))
+
 
 ifeq ($(ZSTD_LEGACY_SUPPORT), 0)
 CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=0