From 4202ce3ec9489dc2042eb94a130c23c44bad13a1 Mon Sep 17 00:00:00 2001 From: Scott Wheeler Date: Sun, 7 Mar 2010 19:03:35 +0000 Subject: [PATCH] Update .pro file git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1100537 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib/mpeg/id3v2/id3v2tag.cpp | 2 +- taglib/taglib.pro | 227 +++++++++++++++++++-------------- taglib/taglib_export.h | 2 + 3 files changed, 135 insertions(+), 96 deletions(-) diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index b13dcc39..1d4e8d4c 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -352,7 +352,7 @@ ByteVector ID3v2::Tag::render() const // Loop through the frames rendering them and adding them to the tagData. for(FrameList::Iterator it = d->frameList.begin(); it != d->frameList.end(); it++) { - if ((*it)->header()->frameID().size() != 4) { + if((*it)->header()->frameID().size() != 4) { debug("A frame of unsupported or unknown type \'" + String((*it)->header()->frameID()) + "\' has been discarded"); continue; diff --git a/taglib/taglib.pro b/taglib/taglib.pro index 1b56738c..c0d8ba11 100644 --- a/taglib/taglib.pro +++ b/taglib/taglib.pro @@ -3,45 +3,54 @@ ###################################################################### TEMPLATE = lib -CONFIG += lib_bundle -CONFIG += x86 ppc +CONFIG += lib_bundle staticlib +CONFIG += x86 x86_64 ppc CONFIG -= qt -DEFINES += HAVE_ZLIB=1 NDEBUG +DEFINES += HAVE_ZLIB=1 NDEBUG WITH_ASF WITH_MP4 LIBS += -lz TARGET = TagLib VERSION = 1.6 DEPENDPATH += . \ - ape \ - flac \ - mpc \ - mp4 \ - mpeg \ - ogg \ - ogg/speex \ - toolkit \ - trueaudio \ - wavpack \ - mpeg/id3v1 \ - mpeg/id3v2 \ - ogg/flac \ - ogg/vorbis \ - mpeg/id3v2/frames + ape \ + asf \ + flac \ + mp4 \ + mpc \ + mpeg \ + mpeg/id3v1 \ + mpeg/id3v2 \ + mpeg/id3v2/frames \ + ogg \ + ogg/flac \ + ogg/speex \ + ogg/vorbis \ + riff \ + riff/aiff \ + riff/wav \ + toolkit \ + trueaudio \ + wavpack + INCLUDEPATH += . \ - toolkit \ - mpeg \ - ogg/vorbis \ - ogg \ - flac \ - ogg/flac \ - mpc \ - mp4 \ - wavpack \ - ogg/speex \ - trueaudio \ - ape \ - mpeg/id3v2 \ - mpeg/id3v1 \ - mpeg/id3v2/frames + ape \ + asf \ + flac \ + mp4 \ + mpc \ + mpeg \ + mpeg/id3v1 \ + mpeg/id3v2 \ + mpeg/id3v2/frames \ + ogg \ + ogg/flac \ + ogg/speex \ + ogg/vorbis \ + riff \ + riff/aiff \ + riff/wav \ + toolkit \ + trueaudio \ + wavpack # Input HEADERS += audioproperties.h \ @@ -108,31 +117,65 @@ HEADERS += audioproperties.h \ mpeg/id3v2/frames/urllinkframe.h \ toolkit/tlist.tcc \ toolkit/tmap.tcc -SOURCES += audioproperties.cpp \ - fileref.cpp \ - tag.cpp \ - tagunion.cpp \ - ape/apefooter.cpp \ +SOURCES += ape/apefooter.cpp \ ape/apeitem.cpp \ ape/apetag.cpp \ + asf/asfattribute.cpp \ + asf/asffile.cpp \ + asf/asfproperties.cpp \ + asf/asftag.cpp \ + audioproperties.cpp \ + fileref.cpp \ flac/flacfile.cpp \ flac/flacproperties.cpp \ mp4/mp4atom.cpp \ - mp4/mp4item.cpp \ + mp4/mp4coverart.cpp \ mp4/mp4file.cpp \ + mp4/mp4item.cpp \ mp4/mp4properties.cpp \ + mp4/mp4tag.cpp \ mpc/mpcfile.cpp \ mpc/mpcproperties.cpp \ + mpeg/id3v1/id3v1genres.cpp \ + mpeg/id3v1/id3v1tag.cpp \ + mpeg/id3v2/frames/attachedpictureframe.cpp \ + mpeg/id3v2/frames/commentsframe.cpp \ + mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp \ + mpeg/id3v2/frames/popularimeterframe.cpp \ + mpeg/id3v2/frames/privateframe.cpp \ + mpeg/id3v2/frames/relativevolumeframe.cpp \ + mpeg/id3v2/frames/textidentificationframe.cpp \ + mpeg/id3v2/frames/uniquefileidentifierframe.cpp \ + mpeg/id3v2/frames/unknownframe.cpp \ + mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp \ + mpeg/id3v2/frames/urllinkframe.cpp \ + mpeg/id3v2/id3v2extendedheader.cpp \ + mpeg/id3v2/id3v2footer.cpp \ + mpeg/id3v2/id3v2frame.cpp \ + mpeg/id3v2/id3v2framefactory.cpp \ + mpeg/id3v2/id3v2header.cpp \ + mpeg/id3v2/id3v2synchdata.cpp \ + mpeg/id3v2/id3v2tag.cpp \ mpeg/mpegfile.cpp \ mpeg/mpegheader.cpp \ mpeg/mpegproperties.cpp \ mpeg/xingheader.cpp \ + ogg/flac/oggflacfile.cpp \ ogg/oggfile.cpp \ ogg/oggpage.cpp \ ogg/oggpageheader.cpp \ - ogg/xiphcomment.cpp \ ogg/speex/speexfile.cpp \ ogg/speex/speexproperties.cpp \ + ogg/vorbis/vorbisfile.cpp \ + ogg/vorbis/vorbisproperties.cpp \ + ogg/xiphcomment.cpp \ + riff/aiff/aifffile.cpp \ + riff/aiff/aiffproperties.cpp \ + riff/rifffile.cpp \ + riff/wav/wavfile.cpp \ + riff/wav/wavproperties.cpp \ + tag.cpp \ + tagunion.cpp \ toolkit/tbytevector.cpp \ toolkit/tbytevectorlist.cpp \ toolkit/tdebug.cpp \ @@ -143,92 +186,86 @@ SOURCES += audioproperties.cpp \ trueaudio/trueaudiofile.cpp \ trueaudio/trueaudioproperties.cpp \ wavpack/wavpackfile.cpp \ - wavpack/wavpackproperties.cpp \ - mpeg/id3v1/id3v1genres.cpp \ - mpeg/id3v1/id3v1tag.cpp \ - mpeg/id3v2/id3v2extendedheader.cpp \ - mpeg/id3v2/id3v2footer.cpp \ - mpeg/id3v2/id3v2frame.cpp \ - mpeg/id3v2/id3v2framefactory.cpp \ - mpeg/id3v2/id3v2header.cpp \ - mpeg/id3v2/id3v2synchdata.cpp \ - mpeg/id3v2/id3v2tag.cpp \ - ogg/flac/oggflacfile.cpp \ - ogg/vorbis/vorbisfile.cpp \ - ogg/vorbis/vorbisproperties.cpp \ - mpeg/id3v2/frames/attachedpictureframe.cpp \ - mpeg/id3v2/frames/commentsframe.cpp \ - mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp \ - mpeg/id3v2/frames/popularimeterframe.cpp \ - mpeg/id3v2/frames/relativevolumeframe.cpp \ - mpeg/id3v2/frames/textidentificationframe.cpp \ - mpeg/id3v2/frames/uniquefileidentifierframe.cpp \ - mpeg/id3v2/frames/unknownframe.cpp \ - mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp \ - mpeg/id3v2/frames/urllinkframe.cpp + wavpack/wavpackproperties.cpp - FRAMEWORK_HEADERS.version = Versions - FRAMEWORK_HEADERS.files = \ - audioproperties.h \ - fileref.h \ - tag.h \ - taglib_export.h \ +FRAMEWORK_HEADERS.version = Versions +FRAMEWORK_HEADERS.files = \ ape/apefooter.h \ ape/apeitem.h \ ape/apetag.h \ + asf/asfattribute.h \ + asf/asffile.h \ + asf/asfproperties.h \ + asf/asftag.h \ + audioproperties.h \ + fileref.h \ flac/flacfile.h \ flac/flacproperties.h \ mp4/mp4atom.h \ - mp4/mp4item.h \ + mp4/mp4coverart.h \ mp4/mp4file.h \ + mp4/mp4item.h \ mp4/mp4properties.h \ + mp4/mp4tag.h \ mpc/mpcfile.h \ mpc/mpcproperties.h \ + mpeg/id3v1/id3v1genres.h \ + mpeg/id3v1/id3v1tag.h \ + mpeg/id3v2/frames/attachedpictureframe.h \ + mpeg/id3v2/frames/commentsframe.h \ + mpeg/id3v2/frames/generalencapsulatedobjectframe.h \ + mpeg/id3v2/frames/popularimeterframe.h \ + mpeg/id3v2/frames/privateframe.h \ + mpeg/id3v2/frames/relativevolumeframe.h \ + mpeg/id3v2/frames/textidentificationframe.h \ + mpeg/id3v2/frames/uniquefileidentifierframe.h \ + mpeg/id3v2/frames/unknownframe.h \ + mpeg/id3v2/frames/unsynchronizedlyricsframe.h \ + mpeg/id3v2/frames/urllinkframe.h \ + mpeg/id3v2/id3v2extendedheader.h \ + mpeg/id3v2/id3v2footer.h \ + mpeg/id3v2/id3v2frame.h \ + mpeg/id3v2/id3v2framefactory.h \ + mpeg/id3v2/id3v2header.h \ + mpeg/id3v2/id3v2synchdata.h \ + mpeg/id3v2/id3v2tag.h \ mpeg/mpegfile.h \ mpeg/mpegheader.h \ mpeg/mpegproperties.h \ mpeg/xingheader.h \ + ogg/flac/oggflacfile.h \ ogg/oggfile.h \ ogg/oggpage.h \ ogg/oggpageheader.h \ - ogg/xiphcomment.h \ ogg/speex/speexfile.h \ ogg/speex/speexproperties.h \ + ogg/vorbis/vorbisfile.h \ + ogg/vorbis/vorbisproperties.h \ + ogg/xiphcomment.h \ + riff/aiff/aifffile.h \ + riff/aiff/aiffproperties.h \ + riff/rifffile.h \ + riff/wav/wavfile.h \ + riff/wav/wavproperties.h \ + tag.h \ + taglib_export.h \ + tagunion.h \ toolkit/taglib.h \ toolkit/tbytevector.h \ toolkit/tbytevectorlist.h \ + toolkit/tdebug.h \ toolkit/tfile.h \ toolkit/tlist.h \ + toolkit/tlist.tcc \ toolkit/tmap.h \ + toolkit/tmap.tcc \ toolkit/tstring.h \ toolkit/tstringlist.h \ toolkit/unicode.h \ trueaudio/trueaudiofile.h \ trueaudio/trueaudioproperties.h \ wavpack/wavpackfile.h \ - wavpack/wavpackproperties.h \ - mpeg/id3v1/id3v1genres.h \ - mpeg/id3v1/id3v1tag.h \ - mpeg/id3v2/id3v2extendedheader.h \ - mpeg/id3v2/id3v2footer.h \ - mpeg/id3v2/id3v2frame.h \ - mpeg/id3v2/id3v2framefactory.h \ - mpeg/id3v2/id3v2header.h \ - mpeg/id3v2/id3v2synchdata.h \ - mpeg/id3v2/id3v2tag.h \ - ogg/flac/oggflacfile.h \ - ogg/vorbis/vorbisfile.h \ - ogg/vorbis/vorbisproperties.h \ - mpeg/id3v2/frames/attachedpictureframe.h \ - mpeg/id3v2/frames/commentsframe.h \ - mpeg/id3v2/frames/generalencapsulatedobjectframe.h \ - mpeg/id3v2/frames/relativevolumeframe.h \ - mpeg/id3v2/frames/textidentificationframe.h \ - mpeg/id3v2/frames/uniquefileidentifierframe.h \ - mpeg/id3v2/frames/unknownframe.h \ - mpeg/id3v2/frames/unsynchronizedlyricsframe.h \ - mpeg/id3v2/frames/urllinkframe.h \ - toolkit/tlist.tcc \ - toolkit/tmap.tcc + wavpack/wavpackproperties.h + FRAMEWORK_HEADERS.path = Headers QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS diff --git a/taglib/taglib_export.h b/taglib/taglib_export.h index f1345e94..9673d93a 100644 --- a/taglib/taglib_export.h +++ b/taglib/taglib_export.h @@ -38,6 +38,8 @@ #define TAGLIB_EXPORT #endif +#ifdef HAVE_CONFIG_H #include "taglib_config.h" +#endif #endif -- 2.50.1