summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2020-06-02 18:10:18 +0800
committerꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2020-06-02 18:10:18 +0800
commit5b04ed2203cc52f1ed9937a7dc9eae86e1596f82 (patch)
treeb75015d4205d1f2172298a5fc619daa8f754d2f4
parent33d0ade622b37b0124a5ce6847d314c43d842e4f (diff)
Update build settings for NDK > r18
-rw-r--r--kelakon.pro56
1 files changed, 34 insertions, 22 deletions
diff --git a/kelakon.pro b/kelakon.pro
index 911638b..e98f408 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -13,51 +13,63 @@ RESOURCES += \
LIBS += \
-lcurl \
- -lrtclient \
- -lqrtclient
+ -lrtclient
+
+!android {
+ LIBS += -lqrtclient
+}
contains(ANDROID_TARGET_ARCH,arm64-v8a) {
- LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib
+ LIBS += \
+ -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21 \
+ -lqrtclient_arm64-v8a
ANDROID_EXTRA_LIBS += \
- /usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto.so \
- /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl.so \
- /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so \
- /usr/local/aarch64-linux-android/sysroot/usr/lib/librtclient.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcrypto_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libssl_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcurl.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/librtclient.so \
/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so
}
contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
- LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
+ LIBS += \
+ -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21 \
+ -lqrtclient_armeabi-v7a
ANDROID_EXTRA_LIBS += \
- /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto.so \
- /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \
- /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so \
- /usr/local/arm-linux-androideabi/sysroot/usr/lib/librtclient.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcrypto_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libssl_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcurl.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/librtclient.so \
/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so
}
contains(ANDROID_TARGET_ARCH,x86) {
- LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib
+ LIBS += \
+ -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21 \
+ -lqrtclient_x86
ANDROID_EXTRA_LIBS += \
- /usr/local/i686-linux-android/sysroot/usr/lib/libcrypto.so \
- /usr/local/i686-linux-android/sysroot/usr/lib/libssl.so \
- /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so \
- /usr/local/i686-linux-android/sysroot/usr/lib/librtclient.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcrypto_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libssl_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcurl.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/librtclient.so \
/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so
}
contains(ANDROID_TARGET_ARCH,x86_64) {
- LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib64
+ LIBS += \
+ -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21 \
+ -lqrtclient_x86_64
ANDROID_EXTRA_LIBS += \
- /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcrypto.so \
- /usr/local/x86_64-linux-android/sysroot/usr/lib64/libssl.so \
- /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcurl.so \
- /usr/local/x86_64-linux-android/sysroot/usr/lib64/librtclient.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcrypto_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libssl_1_1.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcurl.so \
+ /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/librtclient.so \
/opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so
}
android {
INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include
+ LIBS += -L/opt/Qt5.14.2/5.14.2/android/lib
QT += svg
DISTFILES += android/AndroidManifest.xml
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android