summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-02 13:23:29 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-02 13:23:29 -0700
commit26de89364cafd252c207b4adb4346c56626d2798 (patch)
tree56fc176342ab44eef5618ae1c31babae41333451 /packaging
parentac8936004e301050b0dc4feda124a893dc00f7df (diff)
downloadsubsurface-26de89364cafd252c207b4adb4346c56626d2798.tar.gz
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 <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh1
1 files changed, 0 insertions, 1 deletions
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 "$@"