summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-07 11:55:38 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-07 14:00:45 -0700
commitc330659df69bc35f0b57e05d9c4b2e0a1873849b (patch)
tree0f1ed3c326bc800e6fe9e3b0e3d290265811edf7
parentdc094c57577f5b0744174f7edfcd14a3f8946b7d (diff)
downloadsubsurface-c330659df69bc35f0b57e05d9c4b2e0a1873849b.tar.gz
Travis: build old style Windows without FTDI support
This way we can still get an smtk2ssrf build until that is added to the windows-container target. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--scripts/windows/travisbuild.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/windows/travisbuild.sh b/scripts/windows/travisbuild.sh
index df13cbae8..02ab1db86 100644
--- a/scripts/windows/travisbuild.sh
+++ b/scripts/windows/travisbuild.sh
@@ -12,5 +12,7 @@ cd ${TRAVIS_BUILD_DIR}/..
mkdir win32
ls -l
cd win32
-bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/mxe-based-build.sh installer
+
+# the MXE build used in this VM doesn't support FTDI
+bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/mxe-based-build.sh -noftdi installer
bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/smtk2ssrf-mxe-build.sh -i