From 1d31c44412a2a1a74730d27e02d0a0a79db207ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Fri, 13 Nov 2020 17:31:30 +0800 Subject: Update for NDK r21b, Qt 5.15.1, and Android API 29 --- kelakon.pro | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index 9f3734a..8928b9b 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -21,7 +21,7 @@ LIBS += \ android { LIBS += \ - -L/opt/Qt5.14.2/5.14.2/android/lib \ + -L/opt/Qt/5.15.1/android/lib \ -lc++ QT += svg certs.path = /assets/certs @@ -31,50 +31,50 @@ android { contains(ANDROID_TARGET_ARCH,arm64-v8a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \ + -L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \ -lqrtclient_arm64-v8a ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \ - /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_arm64-v8a.so + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcrypto_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \ + /opt/Qt/5.15.1/android/lib/libqrtclient_arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21 \ + -L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16 \ -lqrtclient_armeabi-v7a ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/librtclient.so \ - /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libcrypto_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libssl_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/libcurl.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/16/librtclient.so \ + /opt/Qt/5.15.1/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21 \ + -L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16 \ -lqrtclient_x86 ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/librtclient.so \ - /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libcrypto_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libssl_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/libcurl.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/16/librtclient.so \ + /opt/Qt/5.15.1/android/lib/libqrtclient_x86.so } contains(ANDROID_TARGET_ARCH,x86_64) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 \ + -L/opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 \ -lqrtclient_x86_64 ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/librtclient.so \ - /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcrypto_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libssl_1_1.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcurl.so \ + /opt/android-sdk-update-manager/ndk/21.1.6352462/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/librtclient.so \ + /opt/Qt/5.15.1/android/lib/libqrtclient_x86_64.so } debug: DEFINES += DEBUG -- cgit v1.2.3