summaryrefslogtreecommitdiffstats
path: root/scripts/build.sh
diff options
context:
space:
mode:
authorGravatar Rolf Eike Beer <eike@sf-mail.de>2019-03-07 21:58:52 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-09 09:51:55 -0800
commit17211acc53f511282e7fb5518080ae56ef799f15 (patch)
tree67a0bf2abdd2644ace0dfa4c445b108dbf1536d5 /scripts/build.sh
parent3664cc4ee6f9dc4e0d68bc3f0dc51ef2c8fadd95 (diff)
downloadsubsurface-17211acc53f511282e7fb5518080ae56ef799f15.tar.gz
remove obsolete workaround for libdivecomputer includes of libusb
This has been fixed in revision b1d434f0ea9a2958613da9bed32ff3ff3318065e there. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'scripts/build.sh')
-rwxr-xr-xscripts/build.sh6
1 files changed, 0 insertions, 6 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