From dc094c57577f5b0744174f7edfcd14a3f8946b7d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 6 Oct 2018 22:38:29 -0700 Subject: [PATCH] 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 --- packaging/windows/mxe-based-build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) 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