From 2a733582c459f0aeb753b370d16247a27bfaec19 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: Tue, 2 Jun 2020 17:36:01 +0800 Subject: Update to Qt5.14.2 and NDK r19c --- kelakon.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index 437e784..d8814a1 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -23,7 +23,7 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { /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/Qt5.14.1/5.14.1/android/lib/libqrtclient-arm64-v8a.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { @@ -33,7 +33,7 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) { /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/Qt5.14.1/5.14.1/android/lib/libqrtclient_armeabi-v7a.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { @@ -43,7 +43,7 @@ contains(ANDROID_TARGET_ARCH,x86) { /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/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so } contains(ANDROID_TARGET_ARCH,x86_64) { @@ -53,11 +53,11 @@ contains(ANDROID_TARGET_ARCH,x86_64) { /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/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86_64.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so } android { - INCLUDEPATH += /opt/android-ndk/sources/cxx-stl/llvm-libc++/include + INCLUDEPATH += /opt/android-ndkr19c/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 33d0ade622b37b0124a5ce6847d314c43d842e4f 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: Tue, 2 Jun 2020 18:09:39 +0800 Subject: Fix typo --- kelakon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index d8814a1..911638b 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -57,7 +57,7 @@ contains(ANDROID_TARGET_ARCH,x86_64) { } android { - INCLUDEPATH += /opt/android-ndkr19c/sources/cxx-stl/llvm-libc++/include + INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 5b04ed2203cc52f1ed9937a7dc9eae86e1596f82 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: Tue, 2 Jun 2020 18:10:18 +0800 Subject: Update build settings for NDK > r18 --- kelakon.pro | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'kelakon.pro') 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 -- cgit v1.2.3 From c40ea266dac518db082b69927950b0fe6acdd27e 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: Tue, 2 Jun 2020 20:13:13 +0800 Subject: android-clang spec links to libc++ explicitly --- kelakon.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index e98f408..8b82a16 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -69,7 +69,9 @@ contains(ANDROID_TARGET_ARCH,x86_64) { android { INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include - LIBS += -L/opt/Qt5.14.2/5.14.2/android/lib + LIBS += \ + -L/opt/Qt5.14.2/5.14.2/android/lib \ + -lc++ QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 786624cacf3c5f60976af4954f1ad83d34872011 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: Tue, 2 Jun 2020 20:17:08 +0800 Subject: Fix typos --- kelakon.pro | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index 8b82a16..0272335 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -21,49 +21,49 @@ LIBS += \ contains(ANDROID_TARGET_ARCH,arm64-v8a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21 \ + -L/opt/android-ndk-r19c/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/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/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 } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21 \ -lqrtclient_armeabi-v7a ANDROID_EXTRA_LIBS += \ - /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/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 } contains(ANDROID_TARGET_ARCH,x86) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21 \ -lqrtclient_x86 ANDROID_EXTRA_LIBS += \ - /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/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 } contains(ANDROID_TARGET_ARCH,x86_64) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21 \ + -L/opt/android-ndk-r19c/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/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/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 } -- cgit v1.2.3 From e5463f53923f8a8bcf64f2b8b3d34c1e01b9f5e4 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: Tue, 2 Jun 2020 20:18:33 +0800 Subject: Fix another typo --- kelakon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index 0272335..c4bedcf 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -28,7 +28,7 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { /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/Qt5.14.2/5.14.2/android/lib/libqrtclient_arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { -- cgit v1.2.3 From 82a5a432f4903a132a64caae9425b5376b7bce43 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: Tue, 2 Jun 2020 21:02:29 +0800 Subject: Remove Android Manifest It doesn't seem to be needed any more. When creating a new project by current version of Qt Creator for Android platform, it's not included. And it fails build too. --- kelakon.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index c4bedcf..b5a7a8d 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -73,8 +73,6 @@ android { -L/opt/Qt5.14.2/5.14.2/android/lib \ -lc++ QT += svg - DISTFILES += android/AndroidManifest.xml - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android certs.path = /assets/certs certs.files = /etc/ssl/certs/ca-certificates.crt INSTALLS += certs -- cgit v1.2.3 From 60f6ce2613a70645b3c71ee968886d764d4d1d19 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: Tue, 2 Jun 2020 21:16:45 +0800 Subject: Reorder lines --- kelakon.pro | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kelakon.pro') diff --git a/kelakon.pro b/kelakon.pro index b5a7a8d..beceb6b 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -19,6 +19,17 @@ LIBS += \ LIBS += -lqrtclient } +android { + INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include + LIBS += \ + -L/opt/Qt5.14.2/5.14.2/android/lib \ + -lc++ + QT += svg + certs.path = /assets/certs + certs.files = /etc/ssl/certs/ca-certificates.crt + INSTALLS += certs +} + 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 \ @@ -67,15 +78,4 @@ contains(ANDROID_TARGET_ARCH,x86_64) { /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 \ - -lc++ - QT += svg - certs.path = /assets/certs - certs.files = /etc/ssl/certs/ca-certificates.crt - INSTALLS += certs -} - debug: DEFINES += DEBUG -- cgit v1.2.3