From 4b8889686335c0d52272226167a8f18377eef7cd Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 27 Aug 2019 12:08:28 -0700 Subject: [PATCH] Updates for Qt 5.12 and 64 bit --- QGCCommon.pri | 3 ++- QGCExternalLibs.pri | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/QGCCommon.pri b/QGCCommon.pri index 826e4a78f..332e9d16a 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -33,7 +33,7 @@ linux { DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__ DEFINES += QGC_GST_TAISYNC_ENABLED DEFINES += QGC_GST_MICROHARD_ENABLED - } else : android-g++ | android-clang { + } else : android-clang { CONFIG += AndroidBuild MobileBuild DEFINES += __android__ DEFINES += __STDC_LIMIT_MACROS @@ -41,6 +41,7 @@ linux { DEFINES += QGC_GST_TAISYNC_ENABLED DEFINES += QGC_GST_MICROHARD_ENABLED QMAKE_CXXFLAGS += -Wno-address-of-packed-member + QMAKE_LINK += -nostdlib++ # Hack fix?: https://forum.qt.io/topic/103713/error-cannot-find-lc-qt-5-12-android target.path = $$DESTDIR equals(ANDROID_TARGET_ARCH, x86) { CONFIG += Androidx86Build diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 3df27757b..fef038f5f 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -130,6 +130,10 @@ AndroidBuild { contains(QT_ARCH, arm) { ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so + } else:contains(QT_ARCH, arm64) { + # Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork. + #ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so + #ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so } else { ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libssl.so -- 2.22.0