Merge branch 'modTests' into dev

fixed conflict
2017-08-31 17:00:16 -07:00
parent 4299c27132 4e81dc04f9
commit c7818fc676
3 changed files with 13 additions and 17 deletions
@@ -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)))