diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/plugins.pri | 2 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 09995a399..d4099197d 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -10,7 +10,7 @@ win32 { } unix { - PLUGINS_PREFIX=../../../../lib/qmmp + PLUGINS_PREFIX=../../../../lib/qmmp-$${QMMP_VERSION_MAJOR}.$${QMMP_VERSION_MINOR} LIBS += -lqmmp QMMPUI_LIB = -lqmmpui } diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index 9c0e3e8fb..caa65fbb6 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -25,10 +25,8 @@ #include <QFile> #include <QByteArray> -#ifndef LIB_DIR -#define LIB_DIR "/lib" -#endif - +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) #define DEV_SUFFIX "dev" #include "qmmp.h" @@ -87,15 +85,12 @@ const QString Qmmp::pluginsPath() QByteArray path = qgetenv("QMMP_PLUGINS"); if (!path.isEmpty()) return path; -#ifdef QMMP_INSTALL_PREFIX - QDir dir(QMMP_INSTALL_PREFIX "/" LIB_DIR "/qmmp"); - //qDebug(QMMP_INSTALL_PREFIX"/"LIB_DIR"/qmmp"); -#else -#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) +#ifdef QMMP_PLUGIN_DIR + QDir dir(QMMP_PLUGIN_DIR "/" STR(QMMP_VERSION_MAJOR) "." STR(QMMP_VERSION_MINOR)); +#elif defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) QDir dir(qApp->applicationDirPath() + "/plugins"); #else - QDir dir(qApp->applicationDirPath() + "/../" LIB_DIR "/qmmp"); -#endif + QDir dir(qApp->applicationDirPath() + "/../lib/qmmp-" STR(QMMP_VERSION_MAJOR) "." STR(QMMP_VERSION_MINOR)); #endif return dir.canonicalPath(); } |