diff --git a/.travis.yml b/.travis.yml index 40712a99..8628d15e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ script: - make - make test - make everything + - make amalgamate - make clean - make SANITIZEGOLD=1 test - make clean diff --git a/Makefile b/Makefile index cb1350b5..cb18f7a4 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ quiettest: jsoncheck numberparsingcheck stringparsingcheck basictests allparsers amalgamate: ./amalgamation.sh - + $(CXX) $(CXXFLAGS) -o singleheader/demo ./singleheader/amalgamation_demo.cpp -Isingleheader submodules: -git submodule update --init --recursive diff --git a/amalgamation.sh b/amalgamation.sh index 2266c061..035ce01b 100755 --- a/amalgamation.sh +++ b/amalgamation.sh @@ -42,6 +42,7 @@ $SCRIPTPATH/include/simdjson/jsonminifier.h $SCRIPTPATH/include/simdjson/parsedjson.h $SCRIPTPATH/include/simdjson/stage1_find_marks.h $SCRIPTPATH/include/simdjson/stage1_find_marks_flatten.h +$SCRIPTPATH/include/simdjson/stage1_find_marks_flatten_haswell.h $SCRIPTPATH/include/simdjson/stage1_find_marks_macros.h $SCRIPTPATH/include/simdjson/stage1_find_marks_westmere.h $SCRIPTPATH/include/simdjson/stage1_find_marks_haswell.h