From bf2ffd4d596abe2a127db7924a8b1e458dc6158f Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 23 Mar 2012 14:34:49 +0000 Subject: make it possible to compile shared library --- qxmpp.pri | 14 ++++++++++---- src/src.pro | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qxmpp.pri b/qxmpp.pri index 598a1497..f43748c7 100644 --- a/qxmpp.pri +++ b/qxmpp.pri @@ -32,10 +32,16 @@ symbian { QXMPP_LIBS = -l$${QXMPP_LIBRARY_NAME} } -# FIXME: we should be able to use the link_prl option to automatically pull -# in the extra libraries which the qxmpp library needs, but this does not -# seem to work on win32, so we specify the dependencies here: -QXMPP_LIBS += $$QXMPP_INTERNAL_LIBS +# Determine library type (lib or staticlib) +isEmpty(QXMPP_LIBRARY_TYPE) { + QXMPP_LIBRARY_TYPE = staticlib +} +contains(QXMPP_LIBRARY_TYPE,staticlib) { + # FIXME: we should be able to use the link_prl option to automatically pull + # in the extra libraries which the qxmpp library needs, but this does not + # seem to work on win32, so we specify the dependencies here: + QXMPP_LIBS += $$QXMPP_INTERNAL_LIBS +} # Installation prefix and library directory isEmpty(PREFIX) { diff --git a/src/src.pro b/src/src.pro index 816a3f5e..2f9ee1e7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,7 +4,7 @@ QT -= gui TEMPLATE = lib -CONFIG += staticlib +CONFIG += $$QXMPP_LIBRARY_TYPE DEFINES += QT_STATICPLUGIN DEFINES += $$QXMPP_INTERNAL_DEFINES INCLUDEPATH += $$QXMPP_INCLUDEPATH $$QXMPP_INTERNAL_INCLUDES -- cgit v1.2.3