From 3202dfef22592f9038201836ccab081f5e78f26a 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: Wed, 1 Apr 2020 17:21:24 +0800 Subject: Try to make it build after 5.14.1 update --- .gitignore | 4 +++- libicclient | 2 +- qicclient.pro | 31 +++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6221fc7..5e3a43a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ libqicclient.a Makefile moc_* *.o -qicclient.pro.user +qicclient.pro.user* .qmake.stash *.swp +Makefile.Arm* +Makefile.X86* diff --git a/libicclient b/libicclient index 211c5e1..4443285 160000 --- a/libicclient +++ b/libicclient @@ -1 +1 @@ -Subproject commit 211c5e1a57aa8958d64b16d61fcf04dc48d43837 +Subproject commit 4443285897be4058891274e12d242dde25f09760 diff --git a/qicclient.pro b/qicclient.pro index 4d7150b..321d18d 100644 --- a/qicclient.pro +++ b/qicclient.pro @@ -13,7 +13,34 @@ SOURCES += \ catalog.cxx \ basket.cxx \ client.cxx -INCLUDEPATH += $$PWD/libicclient -LIBS += $$PWD/libicclient/libicclient.a +LIBS += -licclient + +contains(ANDROID_TARGET_ARCH,arm64-v8a) { + INCLUDEPATH += \ + /usr/local/aarch64-linux-android/include/c++/4.9.x \ + /usr/local/aarch64-linux-android/sysroot/usr/include + LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib +} + +contains(ANDROID_TARGET_ARCH,armeabi-v7a) { + INCLUDEPATH += \ + /usr/local/arm-linux-androideabi/include/c++/4.9.x \ + /usr/local/arm-linux-androideabi/sysroot/usr/include + LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib +} + +contains(ANDROID_TARGET_ARCH,x86) { + INCLUDEPATH += \ + /usr/local/i686-linux-android/include/c++/4.9.x \ + /usr/local/i686-linux-android/sysroot/usr/include + LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib +} + +contains(ANDROID_TARGET_ARCH,x86_64) { + INCLUDEPATH += \ + /usr/local/x86_64-linux-android/include/c++/4.9.x \ + /usr/local/x86_64-linux-android/sysroot/usr/include + LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib +} debug: DEFINES += DEBUG -- cgit v1.2.3