Merge branch 'dev' into decTest

This commit is contained in:
Yann Collet
2019-08-28 12:17:29 -07:00
3 changed files with 22 additions and 19 deletions
@@ -5,6 +5,7 @@ ZSTD_SRC_ROOT="../../lib"
# Amalgamate the sources
echo "Amalgamating files... this can take a while"
./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c
# Did combining work?
if [ $? -ne 0 ]; then