From 4a64f8d229461abbe262ba66ee189d9c3fa4c5ff 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?=
 <erik@darapsa.co.id>
Date: Wed, 2 Feb 2022 12:58:03 +0800
Subject: Conform to updated qrtclient & design

---
 kelakon.pro | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'kelakon.pro')

diff --git a/kelakon.pro b/kelakon.pro
index fa19e07..a7f5c31 100644
--- a/kelakon.pro
+++ b/kelakon.pro
@@ -1,31 +1,23 @@
 QT += quick
-
+DEFINES += \
+	SERVER_URL=\\\"$$SERVER_URL\\\" \
+	CA_BUNDLE=\\\"$$CA_BUNDLE\\\"
+debug: DEFINES += DEBUG
 HEADERS += controller.hxx
-
 SOURCES += \
 	controller.cxx \
 	main.cxx
-
 RESOURCES += \
 	kelakon.qrc \
 	larva.qrc \
 	larva/material-design-icons.qrc
-
-LIBS += \
-	-lcurl \
-	-lrtclient
-
-!android {
-	LIBS += -lqrtclient
-}
-
+LIBS += -lrtclient
 android {
 	PREFIX = $$ANDROID_NDK_PATH/toolchains/llvm/prebuilt/$$ANDROID_NDK_HOST/sysroot/usr
 	TRIPLE = aarch64-linux-android
 	contains(ANDROID_TARGET_ARCH,armeabi-v7a): TRIPLE = arm-linux-androideabi
 	contains(ANDROID_TARGET_ARCH,x86): TRIPLE = i686-linux-android
 	contains(ANDROID_TARGET_ARCH,x86_64): TRIPLE = x86_64-linux-android
-
 	LIBS += \
 		-L$$PREFIX/lib/$$TRIPLE/$$API \
 		-L$$QT_ANDROID_LIBDIR \
@@ -36,16 +28,15 @@ android {
 		$$PREFIX/lib/$$TRIPLE/$$API/libcurl.so \
 		$$PREFIX/lib/$$TRIPLE/$$API/librtclient.so \
 		$$QT_ANDROID_LIBDIR/libqrtclient_$${ANDROID_TARGET_ARCH}.so
-
 	QT += svg
-	certs.path = /assets/certs
-	certs.files = /etc/ssl/certs/ca-certificates.crt
-	INSTALLS += certs
+	assets.path = /assets
+	assets.files = $$CA_BUNDLE
+	INSTALLS += assets
 }
-
+!android: LIBS += -lqrtclient
 macx {
 	INCLUDEPATH += /usr/local/include
 	LIBS += -L/usr/local/lib
 }
-
-debug: DEFINES += DEBUG
+wasm: QMAKE_CXXFLAGS += -std=c++11
+!wasm: LIBS += -lcurl
-- 
cgit v1.2.3