diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-17 08:51:39 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-17 08:51:39 +0000 |
| commit | acb3d9b6c3df6dd3eaedefde0f6d82f51681158a (patch) | |
| tree | 28e76c1e8db5baddeb75ae97075ecf76977455e7 /src/plugins/Input/mpc | |
| parent | 49cdf460a519565b113892095c874c15ef755bc5 (diff) | |
| download | qmmp-acb3d9b6c3df6dd3eaedefde0f6d82f51681158a.tar.gz qmmp-acb3d9b6c3df6dd3eaedefde0f6d82f51681158a.tar.bz2 qmmp-acb3d9b6c3df6dd3eaedefde0f6d82f51681158a.zip | |
added win32 patches
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2537 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mpc')
| -rw-r--r-- | src/plugins/Input/mpc/decodermpcfactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mpc/mpc.pro | 30 |
2 files changed, 22 insertions, 12 deletions
diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index 07fd9693b..3dfd32407 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -75,7 +75,7 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo { FileInfo *info = new FileInfo(fileName); - TagLib::MPC::File fileRef(fileName.toLocal8Bit ()); + TagLib::MPC::File fileRef(fileName.toLocal8Bit().constData()); TagLib::APE::Tag *tag = useMetaData ? fileRef.APETag() : 0; if (tag && !tag->isEmpty()) { diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro index 3fe8322b6..54fdce022 100644 --- a/src/plugins/Input/mpc/mpc.pro +++ b/src/plugins/Input/mpc/mpc.pro @@ -7,7 +7,7 @@ SOURCES += decoder_mpc.cpp \ decodermpcfactory.cpp \ mpcmetadatamodel.cpp TARGET = $$PLUGINS_PREFIX/Input/mpc -QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmpc.so + INCLUDEPATH += ../../../ CONFIG += release \ warn_on \ @@ -15,11 +15,7 @@ CONFIG += release \ link_pkgconfig TEMPLATE = lib QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmp \ - -L/usr/lib \ - -lmpcdec \ - -I/usr/include -PKGCONFIG += taglib + TRANSLATIONS = translations/mpc_plugin_ru.ts \ translations/mpc_plugin_uk_UA.ts \ translations/mpc_plugin_zh_CN.ts \ @@ -35,7 +31,21 @@ TRANSLATIONS = translations/mpc_plugin_ru.ts \ translations/mpc_plugin_es.ts RESOURCES = translations/translations.qrc -isEmpty (LIB_DIR):LIB_DIR = /lib -exists(/usr/include/mpcdec/mpcdec.h):DEFINES += MPC_OLD_API -target.path = $$LIB_DIR/qmmp/Input -INSTALLS += target +unix { + isEmpty(LIB_DIR):LIB_DIR = /lib + target.path = $$LIB_DIR/qmmp/Input + INSTALLS += target + + PKGCONFIG += taglib + LIBS += -lqmmp -lmpcdec -I/usr/include + exists(/usr/include/mpcdec/mpcdec.h):DEFINES += MPC_OLD_API + QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmpc.so +} + +win32 { + HEADERS += ../../../../src/qmmp/metadatamodel.h \ + ../../../../src/qmmp/decoderfactory.h + QMAKE_LIBDIR += ../../../../bin + LIBS += -lqmmp0 -lmpcdec -ltag.dll + DEFINES += MPC_OLD_API +} |