From 26de89364cafd252c207b4adb4346c56626d2798 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 2 Oct 2018 13:23:29 -0700 Subject: Revert "Windows: build against user space FTDI library" This reverts commit 53341c037d5a5ecac6562933aa924b65c207104d. The commit isn't wrong, but it breaks Travis and I can't seem to get the newer MXE build to work on Travis. So while I figure out how to work around THAT, let's just revert this and come back to it once Travis is ready. Signed-off-by: Dirk Hohndel --- packaging/windows/mxe-based-build.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'packaging/windows') diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index ca65c6fe5..4271e744a 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -286,7 +286,6 @@ i686-w64-mingw32.shared-cmake \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \ -DMAKE_TESTS=OFF \ -DBTSUPPORT=ON -DBLESUPPORT=ON \ - -DFTDISUPPORT=ON \ "$BASEDIR"/subsurface make $JOBS "$@" -- cgit v1.2.3-70-g09d2