From 2b1c240707ed4c7b071a79a84bbcd454a12a5c85 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 7 Jun 2012 09:57:41 +0200 Subject: in the absence of QXMPP_STATIC, use shared library import Since building a shared library is the default, handle the absence of QXMPP_STATIC as meaning QXMPP_SHARED. --- README | 4 ++++ src/base/QXmppGlobal.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README b/README index 333ba73d..35d15a73 100644 --- a/README +++ b/README @@ -26,6 +26,10 @@ You can pass the following arguments to qmake: QXMPP_USE_THEORA=1 to enable theora video codec QXMPP_USE_VPX=1 to enable vpx video codec +Note: by default QXmpp is built as a shared library. If you decide to build +a static library instead, you will need to pass -DQXMPP_STATIC when building +your programs against QXmpp. + Building using Qt Creator: Open the qxmpp.pro file in Qt Creator and hit "Build All" to build all diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h index 0e9afb3a..fa44cfbd 100644 --- a/src/base/QXmppGlobal.h +++ b/src/base/QXmppGlobal.h @@ -27,14 +27,14 @@ #include -#if defined(QXMPP_SHARED) +#if defined(QXMPP_STATIC) +# define QXMPP_EXPORT +#else # if defined(QXMPP_BUILD) # define QXMPP_EXPORT Q_DECL_EXPORT # else # define QXMPP_EXPORT Q_DECL_IMPORT # endif -#else -# define QXMPP_EXPORT #endif /// This macro expands a numeric value of the form 0xMMNNPP (MM = -- cgit v1.2.3