diff options
| -rw-r--r-- | examples/example.pri | 12 | ||||
| -rw-r--r-- | qxmpp.pri | 5 | ||||
| -rw-r--r-- | source/source.pro | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/examples/example.pri b/examples/example.pri index 70720602..6b31e46d 100644 --- a/examples/example.pri +++ b/examples/example.pri @@ -2,18 +2,12 @@ include(../qxmpp.pri) TEMPLATE = app -INCLUDEPATH += ../../source +INCLUDEPATH += $$QXMPP_INCLUDE_DIR QT += network xml CONFIG += console -CONFIG(debug, debug|release) { - QXMPP_DIR = ../../source/debug -} else { - QXMPP_DIR = ../../source/release -} - -LIBS += -L$$QXMPP_DIR -l$$QXMPP_LIB -PRE_TARGETDEPS += $${QXMPP_DIR}/lib$${QXMPP_LIB}.a +LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIB +PRE_TARGETDEPS += $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIB}.a @@ -1,7 +1,12 @@ CONFIG += debug_and_release CONFIG(debug, debug|release) { + QXMPP_INCLUDE_DIR = $$PWD/source + QXMPP_LIBRARY_DIR = $$PWD/source/debug QXMPP_LIB = qxmpp_d } else { + QXMPP_INCLUDE_DIR = $$PWD/source + QXMPP_LIBRARY_DIR = $$PWD/source/release QXMPP_LIB = qxmpp } + diff --git a/source/source.pro b/source/source.pro index ecef1683..1d9359cb 100644 --- a/source/source.pro +++ b/source/source.pro @@ -16,11 +16,7 @@ CONFIG += staticlib # automagically put in debug/release folders, so do the # same for other platforms. TARGET = $$QXMPP_LIB -CONFIG(debug, debug|release) { - DESTDIR = debug -} else { - DESTDIR = release -} +DESTDIR = $$QXMPP_LIBRARY_DIR # Header files HEADERS += QXmppUtils.h \ |