diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-08 06:45:27 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-08 06:45:27 +0000 |
| commit | caf8bfb50c950b385edb8ec5265c51ae6c74438f (patch) | |
| tree | d1c5feea942cb88cadb3dbd19ba53203bae7cdc7 | |
| parent | 6c7caacc78493d9d87abd1219b89442bb4415f84 (diff) | |
| download | qxmpp-caf8bfb50c950b385edb8ec5265c51ae6c74438f.tar.gz | |
revert changes to library linking, document why
| -rw-r--r-- | example/example.pri | 10 | ||||
| -rw-r--r-- | source/source.pro | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/example/example.pri b/example/example.pri index d83d6d0f..81f91262 100644 --- a/example/example.pri +++ b/example/example.pri @@ -8,14 +8,12 @@ CONFIG += console debug_and_release CONFIG(debug, debug|release) { QXMPP_LIB = QXmppClient_d + QXMPP_DIR = ../../source/debug } else { QXMPP_LIB = QXmppClient + QXMPP_DIR = ../../source/release } -LIBS += -L../../source -l$$QXMPP_LIB -win32 { - PRE_TARGETDEPS += ../../source/${QXMPP_LIB}.lib -} else { - PRE_TARGETDEPS += ../../source/lib$${QXMPP_LIB}.a -} +LIBS += -L$$QXMPP_DIR -l$$QXMPP_LIB +PRE_TARGETDEPS += $${QXMPP_DIR}/lib$${QXMPP_LIB}.a diff --git a/source/source.pro b/source/source.pro index 1e639467..29a63966 100644 --- a/source/source.pro +++ b/source/source.pro @@ -4,9 +4,16 @@ QT += network \ CONFIG += staticlib \ debug_and_release -TARGET = QXmppClient +# Make sure the library gets built in the same location +# regardless of the platform. On win32 the library is +# automagically put in debug/release folders, so do the +# same for other platforms. CONFIG(debug, debug|release) { - TARGET = $$join(TARGET,,,_d) + win32:TARGET = QXmppClient_d + !win32:TARGET = debug/QXmppClient_d +} else { + win32:TARGET = QXmppClient + !win32:TARGET = release/QXmppClient } # Header files |