From 5d1a92c310d61fb7618b0db976f9f8e34f7b4ed9 Mon Sep 17 00:00:00 2001 From: Jon Escombe Date: Sat, 14 Nov 2015 21:53:15 +0000 Subject: [PATCH] Fixup Linux build for kqoauth --- build.pro | 3 ++- kqoauth/kqoauth.pro | 2 +- src/src.pro | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.pro b/build.pro index 469cdad1f..ccd26230f 100644 --- a/build.pro +++ b/build.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = qwt src +SUBDIRS = qwt unix:!macx { SUBDIRS += kqoauth } +SUBDIRS += src CONFIG += ordered diff --git a/kqoauth/kqoauth.pro b/kqoauth/kqoauth.pro index 60b0d90b8..df6ad9712 100644 --- a/kqoauth/kqoauth.pro +++ b/kqoauth/kqoauth.pro @@ -9,7 +9,7 @@ QT += network CONFIG += \ create_prl -!macx: CONFIG += static_and_shared +unix:!macx: CONFIG += static INC_DIR = . diff --git a/src/src.pro b/src/src.pro index e5abfe088..8088ba88c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -61,8 +61,8 @@ unix:!macx { # build from version in repo for Linux builds since # kqoauth is not packaged for the Debian build INCLUDEPATH += ../kqoauth - LIBS += -L../kqoauth -lkqoauth - DEFINES += GC_HAVE_KQOAUTH + LIBS += ../kqoauth/libkqoauth.a + DEFINES += GC_HAVE_KQOAUTH SOURCES += TwitterDialog.cpp HEADERS += TwitterDialog.h