diff --git a/.CI/travis_script.sh b/.CI/travis_script.sh
index 6372360..a4cfd13 100755
--- a/.CI/travis_script.sh
+++ b/.CI/travis_script.sh
@@ -6,23 +6,17 @@ echo cmake generator: -G ${GM}
 
 pushd ExternData/Resources/C-Sources
 
-echo Running make: $MAKE CFLAGS="${CFLAGS}" TARGETDIR="${TARGETDIR}"
-$MAKE CFLAGS="${CFLAGS}" TARGETDIR="${TARGETDIR}"
-
 popd
 pushd libxml2/$PLATFORM
 
-which $CMAKE
+export PATH=/C/Program\ Files/CMake:/C/Program\ Files/CMake/bin:$PATH
 
-echo Running cmake: $CMAKE -DZLIB_LIBRARY_RELEASE:FILEPATH="$TRAVIS_BUILD_DIR/ExternData/Resources/Library/$PLATFORM/libzlib.a" -DZLIB_INCLUDE_DIR:PATH="$TRAVIS_BUILD_DIR/ExternData/Resources/C-Sources/zlib/" -DLIBXML2_WITH_C14N:BOOL=OFF -DLIBXML2_WITH_CATALOG:BOOL=OFF -DLIBXML2_WITH_DEBUG:BOOL=OFF -DLIBXML2_WITH_FTP:BOOL=OFF -DLIBXML2_WITH_HTML:BOOL=OFF -DLIBXML2_WITH_HTTP:BOOL=OFF -DLIBXML2_WITH_ICONV:BOOL=OFF -DLIBXML2_WITH_ICU:BOOL=OFF -DLIBXML2_WITH_ISO8859X:BOOL=OFF -DLIBXML2_WITH_LEGACY:BOOL=OFF -DLIBXML2_WITH_LZMA:BOOL=OFF -DLIBXML2_WITH_MEM_DEBUG:BOOL=OFF -DLIBXML2_WITH_MODULES:BOOL=OFF -DLIBXML2_WITH_OUTPUT:BOOL=OFF -DLIBXML2_WITH_PATTERN:BOOL=OFF -DLIBXML2_WITH_PROGRAMS:BOOL=OFF -DLIBXML2_WITH_PUSH:BOOL=OFF -DLIBXML2_WITH_PYTHON:BOOL=OFF -DLIBXML2_WITH_READER:BOOL=OFF -DLIBXML2_WITH_REGEXPS:BOOL=OFF -DLIBXML2_WITH_RUN_DEBUG:BOOL=OFF -DLIBXML2_WITH_SAX1:BOOL=OFF -DLIBXML2_WITH_SCHEMAS:BOOL=OFF -DLIBXML2_WITH_SCHEMATRON:BOOL=OFF -DLIBXML2_WITH_TESTS:BOOL=OFF -DLIBXML2_WITH_THREADS:BOOL=ON -DLIBXML2_WITH_THREAD_ALLOC:BOOL=OFF -DLIBXML2_WITH_TREE:BOOL=OFF -DLIBXML2_WITH_VALID:BOOL=OFF -DLIBXML2_WITH_WRITER:BOOL=OFF -DLIBXML2_WITH_XINCLUDE:BOOL=OFF -DLIBXML2_WITH_XPATH:BOOL=ON -DLIBXML2_WITH_XPTR:BOOL=OFF -DLIBXML2_WITH_XPTR_LOCS:BOOL=OFF -DLIBXML2_WITH_ZLIB:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF -DCPACK_BINARY_7Z:BOOL=OFF -DCPACK_BINARY_IFW:BOOL=OFF -DCPACK_BINARY_NSIS:BOOL=OFF -DCPACK_BINARY_NUGET:BOOL=OFF -DCPACK_BINARY_WIX:BOOL=OFF -DCPACK_BINARY_ZIP:BOOL=OFF -DCPACK_SOURCE_7Z:BOOL=OFF -DCPACK_SOURCE_ZIP:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ../ -G "${GM}"
+which $CMAKE
 
 $CMAKE -DZLIB_LIBRARY_RELEASE:FILEPATH="$TRAVIS_BUILD_DIR/ExternData/Resources/Library/$PLATFORM/libzlib.a" -DZLIB_INCLUDE_DIR:PATH="$TRAVIS_BUILD_DIR/ExternData/Resources/C-Sources/zlib/" -DLIBXML2_WITH_C14N:BOOL=OFF -DLIBXML2_WITH_CATALOG:BOOL=OFF -DLIBXML2_WITH_DEBUG:BOOL=OFF -DLIBXML2_WITH_FTP:BOOL=OFF -DLIBXML2_WITH_HTML:BOOL=OFF -DLIBXML2_WITH_HTTP:BOOL=OFF -DLIBXML2_WITH_ICONV:BOOL=OFF -DLIBXML2_WITH_ICU:BOOL=OFF -DLIBXML2_WITH_ISO8859X:BOOL=OFF -DLIBXML2_WITH_LEGACY:BOOL=OFF -DLIBXML2_WITH_LZMA:BOOL=OFF -DLIBXML2_WITH_MEM_DEBUG:BOOL=OFF -DLIBXML2_WITH_MODULES:BOOL=OFF -DLIBXML2_WITH_OUTPUT:BOOL=OFF -DLIBXML2_WITH_PATTERN:BOOL=OFF -DLIBXML2_WITH_PROGRAMS:BOOL=OFF -DLIBXML2_WITH_PUSH:BOOL=OFF -DLIBXML2_WITH_PYTHON:BOOL=OFF -DLIBXML2_WITH_READER:BOOL=OFF -DLIBXML2_WITH_REGEXPS:BOOL=OFF -DLIBXML2_WITH_RUN_DEBUG:BOOL=OFF -DLIBXML2_WITH_SAX1:BOOL=OFF -DLIBXML2_WITH_SCHEMAS:BOOL=OFF -DLIBXML2_WITH_SCHEMATRON:BOOL=OFF -DLIBXML2_WITH_TESTS:BOOL=OFF -DLIBXML2_WITH_THREADS:BOOL=ON -DLIBXML2_WITH_THREAD_ALLOC:BOOL=OFF -DLIBXML2_WITH_TREE:BOOL=OFF -DLIBXML2_WITH_VALID:BOOL=OFF -DLIBXML2_WITH_WRITER:BOOL=OFF -DLIBXML2_WITH_XINCLUDE:BOOL=OFF -DLIBXML2_WITH_XPATH:BOOL=ON -DLIBXML2_WITH_XPTR:BOOL=OFF -DLIBXML2_WITH_XPTR_LOCS:BOOL=OFF -DLIBXML2_WITH_ZLIB:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=OFF -DCPACK_BINARY_7Z:BOOL=OFF -DCPACK_BINARY_IFW:BOOL=OFF -DCPACK_BINARY_NSIS:BOOL=OFF -DCPACK_BINARY_NUGET:BOOL=OFF -DCPACK_BINARY_WIX:BOOL=OFF -DCPACK_BINARY_ZIP:BOOL=OFF -DCPACK_SOURCE_7Z:BOOL=OFF -DCPACK_SOURCE_ZIP:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ../ -G "${GM}"
 
-echo Building with cmake
 $CMAKE --build .
 
-echo Moving libxml2.a
-
 mv libxml2.a ../../ExternData/Resources/Library/$PLATFORM/libxml2.a
 popd
 
diff --git a/.travis.yml b/.travis.yml
index 1ba138b..ccdd753 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,45 +20,6 @@ env:
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux32
-        - CFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux32"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: clang
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: osx
-      compiler: gcc
-      env:
-        - PLATFORM=darwin64
-        - CC=gcc
-        - CMAKE=cmake
-        - TARGETDIR="darwin64"
-        - GM="Unix Makefiles"
-        - MAKE=make
     - os: windows
       compiler: gcc
       env:
@@ -92,7 +53,7 @@ before_install:
         ## mostly from here: https://docs.travis-ci.com/user/reference/windows/
         [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
         choco uninstall -y mingw
-        choco upgrade --no-progress -y msys2
+        choco upgrade --no-progress -y msys2 cmake
         export msys2='cmd //C RefreshEnv.cmd '
         export msys2+='& set MSYS=winsymlinks:nativestrict '
         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'