mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
build.sh: don't fail if we can't find libusb or hidapi
Also remove a left behind debug printout. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
20f5609a6c
commit
dd1bdd3f81
1 changed files with 2 additions and 3 deletions
|
@ -230,9 +230,8 @@ if [[ $PLATFORM = Darwin || "$LIBGIT" < "24" ]] ; then
|
|||
# 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
|
||||
LIBDC_CFLAGS=-I$(dirname $(pkg-config --cflags libusb-1.0 | sed -e 's/^-I//'))
|
||||
LIBDC_CFLAGS="${LIBDC_CFLAGS} -I$(dirname $(pkg-config --cflags hidapi | sed -e 's/^-I//'))"
|
||||
echo $LIBDC_CFLAGS
|
||||
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
|
||||
|
||||
LIBGIT_ARGS=" -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT "
|
||||
|
|
Loading…
Add table
Reference in a new issue