From 3368b89336b07b93f036ace72c961d6206dd0b03 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 3 Dec 2017 11:52:48 -0800 Subject: libdc: get the submodule for Travis CI / Windows MXE Signed-off-by: Dirk Hohndel --- scripts/windows/before_install.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'scripts/windows/before_install.sh') 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}/.. -- cgit v1.2.3-70-g09d2