Skip to content

Q
qgroundcontrol
Commit ba77b733 authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files
Options

merge with remote

parents 11ff57e9 04ee2738
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
QGCExternalLibs.pri
View file @ ba77b733
...@@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
# GeograpicLib (TODO: add Windows support!) # GeograpicLib (TODO: add Windows support!)
LinuxBuild { 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!) # google or-tools (TODO: add Windows support!)
......
QGCExternalLibs.pri.orig
View file @ ba77b733
...@@ -202,7 +202,7 @@ LinuxBuild { ...@@ -202,7 +202,7 @@ LinuxBuild {
LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so
======= =======
LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17 LIBS += -L$$BASEDIR/libs/libGeographic/ -lGeographic # libGeograpic.so.17
>>>>>>> libGeographic.so added to libs/libGeographic >>>>>>> 04ee2738cf3faf30a352fc899ffc529912826c01
} }
# google or-tools (TODO: add Windows support!) # google or-tools (TODO: add Windows support!)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment