From 807699759d277f3feef1a07258118acf5afec43f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 12 Feb 2019 11:20:50 +0100 Subject: [PATCH] Allow building with clang (Required for Qt 5.12 on Android) --- nymea-app/nymea-app.pro | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 3b750ec6..978c4c0e 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -42,8 +42,18 @@ equals(STYLES_PATH, "") { android { ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android + android-clang { + FIREBASE_STL_VARIANT = c++ + } + + isEmpty(FIREBASE_STL_VARIANT){ + FIREBASE_STL_VARIANT = gnustl + } + + message("Using FIREBASE_STL_VARIANT ($$FIREBASE_STL_VARIANT)") + INCLUDEPATH += /opt/firebase_cpp_sdk/include - LIBS += -L/opt/firebase_cpp_sdk/libs/android/armeabi-v7a/gnustl/ -lfirebase_messaging -lfirebase_app + LIBS += -L/opt/firebase_cpp_sdk/libs/android/armeabi-v7a/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app QT += androidextras HEADERS += platformintegration/android/platformhelperandroid.h