diff options
| -rwxr-xr-x | scripts/build.sh | 6 | ||||
| -rw-r--r-- | scripts/mac/before_install.sh | 7 | ||||
| -rw-r--r-- | scripts/windows/before_install.sh | 11 |
3 files changed, 2 insertions, 22 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index b7a208a07..64daf52b3 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -308,12 +308,6 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then make -j4 -k make -k install popd -else - # we are getting libusb and hidapi from pkg-config and that goes wrong - # or more specifically, the way libdivecomputer references - # the include files goes wrong - pkg-config --exists libusb-1.0 && LIBDC_CFLAGS=-I$(dirname $(pkg-config --cflags libusb-1.0 | sed -e 's/^-I//')) - pkg-config --exists hidapi && LIBDC_CFLAGS="${LIBDC_CFLAGS} -I$(dirname $(pkg-config --cflags hidapi | sed -e 's/^-I//'))" fi diff --git a/scripts/mac/before_install.sh b/scripts/mac/before_install.sh index fb7ba8b36..583c82daa 100644 --- a/scripts/mac/before_install.sh +++ b/scripts/mac/before_install.sh @@ -15,13 +15,6 @@ git fetch --unshallow git pull --tags git describe -# libdivecomputer uses the wrong include path for libusb and hidapi -# the pkgconfig file for libusb/hidapi already gives the include path as -# ../include/libusb-1.0 (../include/hidapi) yet libdivecomputer wants to use -# include <libusb-1.0/libusb.h> and include <hidapi/hidapi.h> -sudo ln -s /usr/local/include/libusb-1.0 /usr/local/include/libusb-1.0/libusb-1.0 -sudo ln -s /usr/local/include/hidapi /usr/local/include/libusb-1.0/hidapi - # prep things so we can build for Mac # we have a custom built Qt some gives us just what we need, including QtWebKit # 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 <libusb-1.0/libusb.h> -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 |