From 96aa904be1683e523fbf5242f09bfc5c6779e002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 19 Dec 2017 14:45:50 +0100 Subject: [PATCH] qgroundcontrol.pro: update build to latest airmapd master which is now a shared library --- qgroundcontrol.pro | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index a3ef22145..42f050b24 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -591,26 +591,9 @@ HEADERS += \ AIRMAPD_PATH = path_to_airmapd -# Protobuf (AirMap) -# This should be optional. As is, QGC now requires protobuf to be installed. -MacBuild { - INCLUDEPATH += \ - /usr/local/opt/protobuf/include - LIBS += \ - -L/usr/local/opt/protobuf/lib -} -LIBS += -lprotobuf - # airmapd INCLUDEPATH += $${AIRMAPD_PATH}/include -LIBS += -L$${AIRMAPD_PATH}/build/src/airmap -lairmap-qt \ - -lairmap-mavlink \ - -lairmap-client -lssl -lcrypto \ - -L$${AIRMAPD_PATH}/build/vendor/fmt/fmt -lfmt \ - -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options \ - -lboost_unit_test_framework \ - -L$${AIRMAPD_PATH}/build/vendor/xdg -lxdg \ - -L$${AIRMAPD_PATH}/build/vendor/uri/src -lnetwork-uri \ +LIBS += -L$${AIRMAPD_PATH}/build/src/airmap -lairmap-qt AndroidBuild { -- 2.22.0