summaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-06 22:38:29 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-07 14:00:45 -0700
commitdc094c57577f5b0744174f7edfcd14a3f8946b7d (patch)
treec05378a2e2e54f87d7f8c50a10c6eab56928cfec /packaging/windows
parentf05d917a37ff66bb6251fe9fd0fec4dc3d07aaa6 (diff)
downloadsubsurface-dc094c57577f5b0744174f7edfcd14a3f8946b7d.tar.gz
MXE: enable building against userspace FTDI drivers again
This still doesn't seem to work as expected and needs more testing. Also, it can be turned off via command line argument Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/windows')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 0927f662a..55355f9e7 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -82,6 +82,13 @@ exec 1> >(tee ./winbuild.log) 2>&1
# for debugging
#trap "set +x; sleep 1; set -x" DEBUG
+if [[ "$1" == "-noftdi" ]] ; then
+ shift
+ FTDI="OFF"
+else
+ FTDI="ON"
+fi
+
# this is run on a rather powerful machine - if you want less
# build parallelism, please change this variable
JOBS="-j4"
@@ -269,6 +276,7 @@ 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=$FTDI \
-DLIBGIT2_FROM_PKGCONFIG=ON \
"$BASEDIR"/subsurface