From f2c35378eea485ac2aa580337bdfdd66fd086137 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 27 Oct 2020 15:51:46 -0700 Subject: [PATCH] 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). Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 3 ++- libdivecomputer | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f27ba3c4b..d08af9382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,6 +156,7 @@ if(NOT ANDROID) pkg_config_library(BLUEZ bluez REQUIRED) endif() pkg_config_library(LIBUSB libusb-1.0 QUIET) + pkg_config_library(LIBMTP libmtp QUIET) endif() include_directories(. @@ -284,7 +285,7 @@ if(NOT ANDROID) endif() #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) # hack to build successfully on LGTM diff --git a/libdivecomputer b/libdivecomputer index 0ebd5d387..c9537fb0f 160000 --- a/libdivecomputer +++ b/libdivecomputer @@ -1 +1 @@ -Subproject commit 0ebd5d3879854206cd1cf0272e6c357004b33727 +Subproject commit c9537fb0fae8e26acb868583a104dd370483e1e6