From f1566dc1e49b4189065c8da1743b4cc1a82c0c4a Mon Sep 17 00:00:00 2001 From: jennerl Date: Tue, 9 Mar 2021 13:26:08 -0600 Subject: [PATCH] updated airmap lib configuration --- QGCExternalLibs.pri | 4 ++-- QGCPostLinkCommon.pri | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 1d3e520..fa99aae 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -241,7 +241,7 @@ contains (DEFINES, DISABLE_AIRMAP) { mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}" && \ mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap" && \ wget -q -O "$${OUT_PWD}/$${AIRMAP_PLATFORM_SDK_FILENAME}" "$${AIRMAP_PLATFORM_SDK_URL}" && dpkg -x "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/" && \ - mv -u "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/*" "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/" && \ + mv -u "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/x86_64-linux-gnu/*" "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/" && \ mv -u "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/" && \ rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}" && \ rm "$${AIRMAP_PLATFORM_SDK_FILENAME}" @@ -249,7 +249,7 @@ contains (DEFINES, DISABLE_AIRMAP) { QMAKE_EXTRA_TARGETS += airmap_platform_sdk_install PRE_TARGETDEPS += $$airmap_platform_sdk_install.target - LIBS += -L$${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH -lairmap-qt + LIBS += -L$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH} -lairmap-qt DEFINES += QGC_AIRMAP_ENABLED } else { message("Skipping support for Airmap (unsupported platform)") diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri index bb15f77..af60391 100644 --- a/QGCPostLinkCommon.pri +++ b/QGCPostLinkCommon.pri @@ -146,7 +146,7 @@ LinuxBuild { # Airmap contains (DEFINES, QGC_AIRMAP_ENABLED) { - QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmap-platform-sdk/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ + QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmap-platform-sdk/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.1.1.0 $$DESTDIR/Qt/libs/ } # QGroundControl start script