diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 393cff545b66c7ba1a9a7302d838eea50c4c1bc2..f15043659000741ae9018af73a86b83a8845bd76 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -213,7 +213,7 @@ LinuxBuild { LinuxBuild { # boost INCLUDEPATH += -L/usr/include/boost - LIBS += -lboost_system + LIBS += -lboost_system # 1.65.1 # ssl LIBS += -lssl LIBS += -lcrypto diff --git a/deploy/QGroundControl.AppImage b/deploy/QGroundControl.AppImage index c29953e1f8d17dd5b027aec45ce95c7abe9895fa..4f4c08dda279aacfa8db88a0df2a36cfe080457d 100755 Binary files a/deploy/QGroundControl.AppImage and b/deploy/QGroundControl.AppImage differ diff --git a/deploy/create_linux_appimage.sh b/deploy/create_linux_appimage.sh index 7b1e5139ceb9904b05ca378765ca397c25c94bd5..11883dec8c25d826c27452d2cace2e352430c2ed 100755 --- a/deploy/create_linux_appimage.sh +++ b/deploy/create_linux_appimage.sh @@ -34,6 +34,8 @@ 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. +# Wima requirements: libortools.so (inside repo), libprotobuf.so (inside repo), libgeographic.so (must be installed). + APP=${QGC_CUSTOM_BINARY_NAME} TMPDIR=`mktemp -d` @@ -63,6 +65,22 @@ 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/ +# copy libortools.so, etc... +cp -L ${QGC_SRC}/libs/or-tools-src-ubuntu/lib/* ${APPDIR}/usr/lib/x86_64-linux-gnu/ + +# copy libGeographic.so +cp -L /usr/lib/x86_64-linux-gnu/libGeographic.so ${APPDIR}/usr/lib/x86_64-linux-gnu/ + +# copy boost +cp -L /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 ${APPDIR}/usr/lib/x86_64-linux-gnu/ + +# copy libcrypto +cp -L /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${APPDIR}/usr/lib/x86_64-linux-gnu/ + +# copy libSDL2 +cp -L /usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0 ${APPDIR}/usr/lib/x86_64-linux-gnu/ + + # copy QGroundControl release into appimage rsync -av --exclude=*.cpp --exclude=*.h --exclude=*.o --exclude="CMake*" --exclude="*.cmake" ${QGC_RELEASE_DIR}/* ${APPDIR}/ rm -rf ${APPDIR}/package