Revision 6f9edfd...

Go back to digest for 3rd March 2013

Other in Multimedia

Matěj Laitl committed changes in [amarok] /:

Biggie: introduce libamarokshared.so library to avoid building things in shared/ twice

Shared libraries exist to *cough* share built code, use them! This is first part
of much larger buildsystem changes planned in Randa 2012.

This also brings some other changes that were needed, namely avoiding UTILITIES_BUILD.
>From changes to top-level CMakeLists.txt it may look as if kdelibs are now needed even
when just utilities (not player) are built. This was however the case for at least a
year now. To be able to build utilities w/put kdelibs we'd need:
a) require newer CMake to do automoc for us
b) replace KDE's KMimeType by Qt5's QMimeDatabase

Static member s_fileTypeStrings of FileTypeSupport is not used outside
the FileType.cpp -> make it a plain static compilation unit variable to
prevent problems with static variables shared across multiple shared
libraries.

@Patrick: this needs at least build testing on Windows to ensure I've done the
KDE_IMPORT/EXPORT macros right.


CCMAIL: Patrick von Reth

File Changes

Added 1 files
  • shared/CMakeLists.txt
Modified 38 files
  •   CMakeLists.txt
  •   shared/FileType.cpp
  •   shared/FileType.h
  •   shared/MetaReplayGain.h
  •   shared/MetaTagLib.cpp
  •   shared/MetaTagLib.h
  •   shared/README
  •   shared/TagsFromFileNameGuesser.h
  •   src/CMakeLists.txt
  •   shared/collectionscanner/Album.cpp
  •   shared/collectionscanner/Album.h
  •   shared/collectionscanner/BatchFile.h
  •   shared/collectionscanner/Directory.cpp
  •   shared/collectionscanner/Directory.h
  •   shared/collectionscanner/Playlist.h
  •   shared/collectionscanner/ScanningState.h
  •   shared/collectionscanner/Track.h
  •   shared/tag_helpers/APETagHelper.h
  •   shared/tag_helpers/ASFTagHelper.cpp
  •   shared/tag_helpers/ASFTagHelper.h
  •   shared/tag_helpers/ID3v2TagHelper.cpp
  •   shared/tag_helpers/ID3v2TagHelper.h
  •   shared/tag_helpers/MP4TagHelper.cpp
  •   shared/tag_helpers/MP4TagHelper.h
  •   shared/tag_helpers/StringHelper.h
  •   shared/tag_helpers/TagHelper.cpp
  •   shared/tag_helpers/TagHelper.h
  •   shared/tag_helpers/VorbisCommentTagHelper.cpp
  •   shared/tag_helpers/VorbisCommentTagHelper.h
  •   utilities/collectionscanner/CMakeLists.txt
  •   utilities/collectionscanner/CollectionScanner.cpp
  •   utilities/collectionscanner/CollectionScanner.h
  •   src/core-impl/collections/ipodcollection/CMakeLists.txt
  •   src/core-impl/collections/umscollection/CMakeLists.txt
  •   src/core-impl/collections/umscollection/UmsCollection.cpp
  •   src/core-impl/collections/db/sql/CMakeLists.txt
  •   src/core-impl/collections/support/jobs/WriteTagsJob.cpp
  •   tests/core-impl/collections/db/sql/CMakeLists.txt
39 files changed in total