merge with remote

ba77b733 · Valentin Platzgummer · 11ff57e9 · 04ee2738 · ba77b733 · ba77b733
Commit ba77b733 authored Oct 01, 2020 by Valentin Platzgummer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

QGCExternalLibs.pri QGCExternalLibs.pri +1 -1

QGCExternalLibs.pri.orig QGCExternalLibs.pri.orig +1 -1

No files found.
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) {

 # GeograpicLib (TODO: add Windows support!)
 LinuxBuild {
-    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so
+    LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17
 }

 # google or-tools (TODO: add Windows support!)

--- a/QGCExternalLibs.pri.orig
+++ b/QGCExternalLibs.pri.orig
@@ -202,7 +202,7 @@ LinuxBuild {
    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so
 =======
    LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17
->>>>>>> libGeographic.so added to libs/libGeographic
+>>>>>>> 04ee2738cf3faf30a352fc899ffc529912826c01
 }

 # google or-tools (TODO: add Windows support!)