From 3c5aa51693fe6c95b2e0fb96a2bee3af30b295f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Mon, 19 Apr 2021 12:57:20 +0800 Subject: Update instruction for NDK r21d and Android 11, and fixed Qt5.15.2 --- README.md | 14 +++++++------- qrtclient | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2c507da..4eeaab4 100644 --- a/README.md +++ b/README.md @@ -21,32 +21,32 @@ $ qmake ../kelakon/kelakon.pro -spec linux-g++ CONFIG+='debug qml_debug' or ```sh -$ mkdir build-kelakon-Android_Qt_5_15_2_Clang_Multi_Abi-Debug -$ cd build-kelakon-Android_Qt_5_15_2_Clang_Multi_Abi-Debug +$ mkdir build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_15_2_android-Debug +$ cd build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_15_2_android-Debug ``` and then ```sh -$ /opt/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-ndk ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=arm64-v8a QT_ANDROID_LIBDIR=/opt/Qt/5.15.2/android/lib API=21 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=arm64-v8a +$ /usr/local/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-sdk-update-manager/ndk/21.3.6528147 ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=arm64-v8a QT_ANDROID_LIBDIR=/usr/local/Qt/5.15.2/android/lib API=21 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=arm64-v8a ``` or ```sh -$ /opt/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-ndk ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=armeabi-v7a QT_ANDROID_LIBDIR=/opt/Qt/5.15.2/android/lib API=16 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=armeabi-v7a +$ /usr/local/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-sdk-update-manager/ndk/21.3.6528147 ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=armeabi-v7a QT_ANDROID_LIBDIR=/usr/local/Qt/5.15.2/android/lib API=16 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=armeabi-v7a ``` or ```sh -$ /opt/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-ndk ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=x86 QT_ANDROID_LIBDIR=/opt/Qt/5.15.2/android/lib API=16 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=x86 +$ /usr/local/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-sdk-update-manager/ndk/21.3.6528147 ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=x86 QT_ANDROID_LIBDIR=/usr/local/Qt/5.15.2/android/lib API=16 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=x86 ``` or ```sh -$ /opt/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-ndk ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=x86_64 QT_ANDROID_LIBDIR=/opt/Qt/5.15.2/android/lib API=21 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=x86_64 +$ /usr/local/Qt/5.15.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_NDK_PATH=/opt/android-sdk-update-manager/ndk/21.3.6528147 ANDROID_NDK_HOST=linux-x86_64 ANDROID_TARGET_ARCH=x86_64 QT_ANDROID_LIBDIR=/usr/local/Qt/5.15.2/android/lib API=21 CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt ANDROID_ABIS=x86_64 ``` or so on. @@ -62,7 +62,7 @@ and if for Android: ```sh $ make install INSTALL_ROOT=android-build $ export ANDROID_SDK_ROOT=/opt/android-sdk-update-manager -$ /opt/Qt/5.15.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-28 +$ /usr/local/Qt/5.15.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-30 ``` and if on FreeBSD: diff --git a/qrtclient b/qrtclient index bb98792..6c6ff39 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit bb98792f32c7a18edffe31c3f90778200b93e58d +Subproject commit 6c6ff39590407d5fe2e40ed9e7da78c71c372994 -- cgit v1.2.3