ddidderr/zstd-rs
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'modTests' into dev

Browse Source 
fixed conflict
This commit is contained in:
Yann Collet committed 2017-08-31 17:00:16 -07:00
2 parents 4299c27132 4e81dc04f9
commit c7818fc676
3 files changed
+13 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

programs/Makefile
-1
View File
@@ -67,7 +67,6 @@ else
endif
ZSTDLIB_FILES := $(sort $(wildcard $(ZSTD_FILES)) $(wildcard $(ZSTDLEGACY_FILES)) $(wildcard $(ZDICT_FILES)))
ZSTDLIB_OBJ := $(patsubst %.c,%.o,$(ZSTDLIB_FILES))
# Define *.exe as extension for Windows systems
ifneq (,$(filter Windows%,$(OS)))