From 17211acc53f511282e7fb5518080ae56ef799f15 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 7 Mar 2019 21:58:52 +0100 Subject: remove obsolete workaround for libdivecomputer includes of libusb This has been fixed in revision b1d434f0ea9a2958613da9bed32ff3ff3318065e there. Signed-off-by: Rolf Eike Beer --- scripts/windows/before_install.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scripts/windows') diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh index 449d6a938..3383f0dec 100644 --- a/scripts/windows/before_install.sh +++ b/scripts/windows/before_install.sh @@ -9,7 +9,7 @@ git pull --tags git describe # grab our own custom MXE environment -cd ${TRAVIS_BUILD_DIR}/.. +pushd ${TRAVIS_BUILD_DIR}/.. echo "Downloading prebuilt MXE environment from Subsurface-divelog.org" wget -q http://subsurface-divelog.org/downloads/mxe-994ad473.tar.xz mkdir -p mxe @@ -21,14 +21,7 @@ sudo mkdir -p /data/winqt551/ sudo ln -s ${TRAVIS_BUILD_DIR}/../mxe /data/winqt551/mxe-current ls -l /data/winqt551/mxe-current/usr sudo ln -s ${TRAVIS_BUILD_DIR}/../mxe /usr/src/mxe - -# libdivecomputer uses the wrong include path for libusb -# the pkgconfig file for libusb already gives the include path as -# ../include/libusb-1.0 yet libdivecomputer wants to use -# include -cd usr/i686-w64-mingw32.shared/include/libusb-1.0 -ln -s . libusb-1.0 -cd ${TRAVIS_BUILD_DIR}/.. +popd # now set up our other dependencies -- cgit v1.2.3-70-g09d2