app image updated

QGCExternalLibs.pri

@@ -228,16 +228,17 @@ contains (DEFINES, DISABLE_AIRMAP) {
 
 # GeograpicLib (TODO: add Windows support!)
 LinuxBuild {
-    LIBS += -L$$BASEDIR/libs/libGeographic -lGeographic # libGeograpic.so.17
+    LIBS += -L$$PWD/libs/libGeographic -lGeographic # libGeograpic.so.17
 }
 
 # google or-tools (TODO: add Windows support!)
 LinuxBuild {
-    INCLUDEPATH += $$BASEDIR/libs/or-tools-src-ubuntu/include
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lortools # libortools.so
+    OR_TOOLS_PATH = $$PWD/libs/or-tools-src-ubuntu
+    INCLUDEPATH += $$OR_TOOLS_PATH/include
+    LIBS += -L$$OR_TOOLS_PATH/lib -lortools # libortools.so
     # dependencies
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lglog # libglog.so
-    LIBS += -L$$BASEDIR/libs/or-tools-src-ubuntu/lib -lprotobuf # libprotobuf.so
+    LIBS += -L$$OR_TOOLS_PATH/lib -lglog # libglog.so
+    LIBS += -L$$OR_TOOLS_PATH/lib -lprotobuf # libprotobuf.so
 }
 # ros_bride deps
 LinuxBuild {

deploy/create_linux_appimage.sh

@@ -34,7 +34,6 @@ echo "Output directory:" ${OUTPUT_DIR}
 # These require at least GLIBC 2.14, which older distributions might not have.
 # On the other hand, 2.14 is not that recent so maybe we can just live with it.
 
-# MeasurementComplexItem requirements: libortools.so (inside repo), libprotobuf.so (inside repo), libgeographic.so (must be installed).
 
 APP=${QGC_CUSTOM_APP_NAME}
 
@@ -65,11 +64,13 @@ mkdir libts
 dpkg -x libts-0.0-0_1.0-11_amd64.deb libts
 cp -L libts/usr/lib/x86_64-linux-gnu/libts-0.0.so.0 ${APPDIR}/usr/lib/x86_64-linux-gnu/
 
+# MeasurementComplexItem requirements: libortools.so (inside repo), libprotobuf.so (inside repo), libgeographic.so (must be installed).
+
 # copy libortools.so, etc...
-cp -L ${QGC_SRC}/libs/or-tools-src-ubuntu/lib/* ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libortools.so not found"; exit  1; }
+cp -L ${QGC_SRC}/libs/or-tools-src-ubuntu/lib/*.so* ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libortools.so not found"; exit  1; }
 
 # copy libGeographic.so.17
-cp -L ${QGC_SRC}/libs/libGeographic/libGeographic.so.17 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libGeographic.so.17 not found"; exit  1; }
+cp -L /usr/lib/x86_64-linux-gnu/libGeographic.so.17 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libGeographic.so.17 not found"; exit  1; }
 
 # copy boost
 cp -L /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libboost_system.so.1.65.1 not found"; exit  1; }

libs/or-tools-src-ubuntu/lib/libCbc.so

+libCbc.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCbc.so.3

+libCbc.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCbcSolver.so

+libCbcSolver.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCbcSolver.so.3

+libCbcSolver.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCgl.so

+libCgl.so.1.10.3
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCgl.so.1

+libCgl.so.1.10.3
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libClp.so

+libClp.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libClp.so.1

+libClp.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libClpSolver.so

+libClpSolver.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libClpSolver.so.1

+libClpSolver.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCoinUtils.so

+libCoinUtils.so.3.11.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libCoinUtils.so.3

+libCoinUtils.so.3.11.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsi.so

+libOsi.so.1.13.6
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsi.so.1

+libOsi.so.1.13.6
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiCbc.so

+libOsiCbc.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiCbc.so.3

+libOsiCbc.so.3.10.5
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiClp.so

+libOsiClp.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiClp.so.1

+libOsiClp.so.1.14.4
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiCommonTests.so

+libOsiCommonTests.so.1.13.6
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libOsiCommonTests.so.1

+libOsiCommonTests.so.1.13.6
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libgflags.so

+libgflags.so.2.2
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libgflags.so.2.2

+libgflags.so.2.2.2
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libgflags_nothreads.so

+libgflags_nothreads.so.2.2
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libgflags_nothreads.so.2.2

+libgflags_nothreads.so.2.2.2
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libglog.so

+libglog.so.0
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libglog.so.0

+libglog.so.0.4.0
\ No newline at end of file

libs/or-tools-src-ubuntu/lib/libprotobuf-lite.so

+libprotobuf-lite.so.3.12.2.0
\ No newline at end of file