add initial support for the Garmin Descent Mk2i

This brings in the needed libdivecomputer updates and builds Subsurface against
libmtp in order to support downloading dive data via MTP (since the Mk2/Mk2i
no longer provide a FAT filesystem via USB).

In order for this to work you need to have libmtp installed on your system.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-10-27 15:51:46 -07:00
parent 31813af49a
commit 4b24730ee6
2 changed files with 3 additions and 2 deletions

View file

@ -156,6 +156,7 @@ if(NOT ANDROID)
pkg_config_library(BLUEZ bluez REQUIRED) pkg_config_library(BLUEZ bluez REQUIRED)
endif() endif()
pkg_config_library(LIBUSB libusb-1.0 QUIET) pkg_config_library(LIBUSB libusb-1.0 QUIET)
pkg_config_library(LIBMTP libmtp QUIET)
endif() endif()
include_directories(. include_directories(.
@ -284,7 +285,7 @@ if(NOT ANDROID)
endif() endif()
#set up the subsurface_link_libraries variable #set up the subsurface_link_libraries variable
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES}) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBMTP_LIBRARIES})
qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc) qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc)
# hack to build successfully on LGTM # hack to build successfully on LGTM

@ -1 +1 @@
Subproject commit 0ebd5d3879854206cd1cf0272e6c357004b33727 Subproject commit 3a300a6a8ff81665463e0172e3fc5e0bcc92ec65