aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/Input/modplug/modplug.pro3
-rw-r--r--src/qmmp/qmmp.cpp5
-rw-r--r--src/qmmp/qmmp.h8
3 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index 2b456bab7..6fef05c56 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -38,9 +38,6 @@ TRANSLATIONS = translations/modplug_plugin_cs.ts \
translations/modplug_plugin_es.ts
RESOURCES = translations/translations.qrc
-isEmpty(LIB_DIR):LIB_DIR = /lib
-target.path = $$LIB_DIR/qmmp/Input
-INSTALLS += target
unix {
isEmpty(LIB_DIR):LIB_DIR = /lib
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index aeab23bed..9dbcb0901 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -49,9 +49,10 @@ void Qmmp::setConfigFile(const QString &path)
const QString Qmmp::strVersion()
{
#ifdef SVN_REVISION
- return QString("%1-%2").arg(QMMP_STR_VERSION).arg(SVN_REVISION);
+ return QString("%1.%2.%3-%4").arg(QMMP_VERSION_MAJOR).arg(QMMP_VERSION_MINOR).arg(QMMP_VERSION_PATCH)
+ .arg(SVN_REVISION);
#else
- return QMMP_STR_VERSION;
+ return QString("%1.%2.%3").arg(QMMP_VERSION_MAJOR).arg(QMMP_VERSION_MINOR).arg(QMMP_VERSION_PATCH);
#endif
}
diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h
index 731670346..b3f1dba04 100644
--- a/src/qmmp/qmmp.h
+++ b/src/qmmp/qmmp.h
@@ -23,6 +23,14 @@
#include <QUrl>
#include <QEvent>
+
+#define QMMP_VERSION_MAJOR 0
+#define QMMP_VERSION_MINOR 6
+#define QMMP_VERSION_PATCH 0
+
+#define QMMP_VERSION_INT (QMMP_VERSION_MAJOR<<16 | QMMP_VERSION_MINOR<<8 | QMMP_VERSION_PATCH)
+
+
/*! @brief The Qmmp class stores global settings and enums.
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/