diff options
| author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-04 22:39:06 +0800 |
|---|---|---|
| committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-04 22:39:06 +0800 |
| commit | 401696102ef4dc31bea2ae6f0ce95ddd7b31f55f (patch) | |
| tree | 7480062d449fc3081ed5f633a7f2ae582e43160f /kelakon.pro | |
| parent | e7e65ade4a4f85ed24c1829402e2936b189d193f (diff) | |
Update to Qt5.14.1
even though still fails at linking.
Diffstat (limited to 'kelakon.pro')
| -rw-r--r-- | kelakon.pro | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/kelakon.pro b/kelakon.pro index 114a8b5..437e784 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -1,4 +1,4 @@ -QT += quickcontrols2 +QT += quick HEADERS += controller.hxx @@ -11,43 +11,53 @@ RESOURCES += \ larva.qrc \ larva/material-design-icons.qrc -INCLUDEPATH += \ - $$PWD/qrtclient \ - $$PWD/qrtclient/librtclient - LIBS += \ - $$PWD/qrtclient/libqrtclient.a \ - $$PWD/qrtclient/librtclient/librtclient.a \ - -lcurl + -lcurl \ + -lrtclient \ + -lqrtclient contains(ANDROID_TARGET_ARCH,arm64-v8a) { - QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so + /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/Qt5.14.1/5.14.1/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { - QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so + /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/Qt5.14.1/5.14.1/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { - QMAKE_CFLAGS += -I/usr/local/i686-linux-android/sysroot/usr/include LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so + /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/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86.so +} + +contains(ANDROID_TARGET_ARCH,x86_64) { + LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib64 + 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/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86_64.so } android { + INCLUDEPATH += /opt/android-ndk/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android |