Commit de1ea401 authored by Valentin Platzgummer's avatar Valentin Platzgummer

app image updated

parent 6d59dbd1
......@@ -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 {
......
......@@ -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; }
......
libCbc.so.3.10.5
\ No newline at end of file
libCbc.so.3.10.5
\ No newline at end of file
libCbcSolver.so.3.10.5
\ No newline at end of file
libCbcSolver.so.3.10.5
\ No newline at end of file
libCgl.so.1.10.3
\ No newline at end of file
libCgl.so.1.10.3
\ No newline at end of file
libClp.so.1.14.4
\ No newline at end of file
libClp.so.1.14.4
\ No newline at end of file
libClpSolver.so.1.14.4
\ No newline at end of file
libClpSolver.so.1.14.4
\ No newline at end of file
libCoinUtils.so.3.11.4
\ No newline at end of file
libCoinUtils.so.3.11.4
\ No newline at end of file
libOsi.so.1.13.6
\ No newline at end of file
libOsi.so.1.13.6
\ No newline at end of file
libOsiCbc.so.3.10.5
\ No newline at end of file
libOsiCbc.so.3.10.5
\ No newline at end of file
libOsiClp.so.1.14.4
\ No newline at end of file
libOsiClp.so.1.14.4
\ No newline at end of file
libOsiCommonTests.so.1.13.6
\ No newline at end of file
libOsiCommonTests.so.1.13.6
\ No newline at end of file
libgflags.so.2.2
\ No newline at end of file
libgflags.so.2.2.2
\ No newline at end of file
libgflags_nothreads.so.2.2
\ No newline at end of file
libgflags_nothreads.so.2.2.2
\ No newline at end of file
libglog.so.0
\ No newline at end of file
libglog.so.0.4.0
\ No newline at end of file
libprotobuf-lite.so.3.12.2.0
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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