summaryrefslogtreecommitdiffstats
path: root/scripts/windows/before_install.sh
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-12-03 11:52:48 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-12-03 14:12:06 -0800
commit3368b89336b07b93f036ace72c961d6206dd0b03 (patch)
tree91d338332d910c92c8080b270ef73ac8c83023e5 /scripts/windows/before_install.sh
parentdd20c2004df2d23f1384e3bcac6ddc19407bf2f7 (diff)
downloadsubsurface-3368b89336b07b93f036ace72c961d6206dd0b03.tar.gz
libdc: get the submodule for Travis CI / Windows MXE
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/windows/before_install.sh')
-rw-r--r--scripts/windows/before_install.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh
index 1d95206a0..7eef67d17 100644
--- a/scripts/windows/before_install.sh
+++ b/scripts/windows/before_install.sh
@@ -36,16 +36,10 @@ CURRENT_HIDAPI="hidapi-0.7.0"
CURRENT_LIBUSB="v1.0.21"
CURRENT_LIBGIT2="v0.26.0"
-
-#this will soon be a git submodule
+# make sure we have libdivecomputer
echo "Get libdivecomputer"
-cd ${TRAVIS_BUILD_DIR}/..
-git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer
-cd libdivecomputer
-if [ ! -f ./configure ] ; then
- autoreconf --install .
- autoreconf --install . # not a typo - somehow/sometimes libdivecomputer needs to run this twice. Don't ask.
-fi
+cd ${TRAVIS_BUILD_DIR}
+git submodule update --recursive
echo "Get libusb"
cd ${TRAVIS_BUILD_DIR}/..