diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-11 05:05:31 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-11 05:05:31 +0000 |
| commit | dbd94e41aeb655a6244aeac67d2c54cefa6785bd (patch) | |
| tree | b3f665469881fca410bc469ea71109577d294fc2 | |
| parent | 5a3ff5fcd51981ba6f65d161cda46471ce650c50 (diff) | |
| download | qxmpp-dbd94e41aeb655a6244aeac67d2c54cefa6785bd.tar.gz | |
cleanup library name definition
| -rw-r--r-- | examples/examples.pri | 7 | ||||
| -rw-r--r-- | qxmpp.pri | 7 | ||||
| -rw-r--r-- | source/source.pro | 2 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 82e6f2bb..4ee6b54d 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -7,6 +7,9 @@ QT += network xml CONFIG += console INCLUDEPATH += $$QXMPP_INCLUDE_DIR -LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIB -PRE_TARGETDEPS += $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIB}.a +LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIBRARY_NAME + +# FIXME: we need to express a dependency on the library, but the file name +# depends on the platform and whether the library is static or dynamic +# PRE_TARGETDEPS += $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIB}.a @@ -1,13 +1,12 @@ CONFIG += debug_and_release QXMPP_VERSION = 0.1.91 +QXMPP_INCLUDE_DIR = $$PWD/source CONFIG(debug, debug|release) { - QXMPP_INCLUDE_DIR = $$PWD/source QXMPP_LIBRARY_DIR = $$PWD/source/debug - QXMPP_LIB = qxmpp_d + QXMPP_LIBRARY_NAME = qxmpp_d } else { - QXMPP_INCLUDE_DIR = $$PWD/source QXMPP_LIBRARY_DIR = $$PWD/source/release - QXMPP_LIB = qxmpp + QXMPP_LIBRARY_NAME = qxmpp } diff --git a/source/source.pro b/source/source.pro index 75a1dda7..a30f8efd 100644 --- a/source/source.pro +++ b/source/source.pro @@ -13,7 +13,7 @@ CONFIG += staticlib # DEFINES += QXMPP_USE_SPEEX # Target definition -TARGET = $$QXMPP_LIB +TARGET = $$QXMPP_LIBRARY_NAME VERSION = $$QXMPP_VERSION DESTDIR = $$QXMPP_LIBRARY_DIR diff --git a/tests/tests.pro b/tests/tests.pro index 8d4ed08a..1ce95d39 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -9,4 +9,4 @@ SOURCES += tests.cpp HEADERS += tests.h INCLUDEPATH += $$QXMPP_INCLUDE_DIR -LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIB +LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIBRARY_NAME |