Skip to content

Q
qgroundcontrol
Commit 51e836b9 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent 6fc98796
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
QGCExternalLibs.pri
View file @ 51e836b9
......@@ -120,19 +120,20 @@ MacBuild {
}
# Include Android OpenSSL libs in order to make Qt OpenSSL support work
AndroidBuild {
equals(ANDROID_TARGET_ARCH, armeabi-v7a) {
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libssl.so
} else:equals(ANDROID_TARGET_ARCH, arm64-v8a) {
# Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork.
} else:equals(ANDROID_TARGET_ARCH, x86) {
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libssl.so
} else {
error("Unsupported Android architecture: $${ANDROID_TARGET_ARCH}")
}
}
# Temp removal
#AndroidBuild {
# equals(ANDROID_TARGET_ARCH, armeabi-v7a) {
# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libcrypto.so
# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libssl.so
# } else:equals(ANDROID_TARGET_ARCH, arm64-v8a) {
# # Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork.
# } else:equals(ANDROID_TARGET_ARCH, x86) {
# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libcrypto.so
# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libssl.so
# } else {
# error("Unsupported Android architecture: $${ANDROID_TARGET_ARCH}")
# }
#}
# Pairing
contains(DEFINES, QGC_ENABLE_PAIRING) {
......
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