aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-08-07 22:52:46 +0200
committerMax Kellermann <max@duempel.org>2014-08-07 22:52:46 +0200
commit7a048f004dc1c7d35518e38c75861bc167ade945 (patch)
treeacd003908655626a1e2e96c8cec0c21747283d09 /Makefile.am
parentaa2e4d92e0005f4516eb591803120eff89f99109 (diff)
parent330b6a04822a49aec23a968061faac4f49a94afa (diff)
downloadmpd-7a048f004dc1c7d35518e38c75861bc167ade945.tar.gz
mpd-7a048f004dc1c7d35518e38c75861bc167ade945.tar.xz
mpd-7a048f004dc1c7d35518e38c75861bc167ade945.zip
Merge branch 'id-3919' of git://github.com/ekroth/mpd
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 3ab492aae..2ee505f96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -799,6 +799,7 @@ libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(WAVPACK_CFLAGS) \
$(MAD_CFLAGS) \
$(MPG123_CFLAGS) \
+ $(MP4V2_CFLAGS) \
$(OPUS_CFLAGS) \
$(FFMPEG_CFLAGS) \
$(MPCDEC_CFLAGS) \
@@ -818,6 +819,7 @@ DECODER_LIBS = \
$(WAVPACK_LIBS) \
$(MAD_LIBS) \
$(MPG123_LIBS) \
+ $(MP4V2_LIBS) \
$(OPUS_LIBS) \
$(FFMPEG_LIBS) \
$(MPCDEC_LIBS) \
@@ -922,6 +924,12 @@ noinst_LIBRARIES += libmodplug_decoder_plugin.a
DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS)
endif
+if HAVE_MP4V2
+libdecoder_a_SOURCES += \
+ src/decoder/plugins/Mp4v2DecoderPlugin.cxx \
+ src/decoder/plugins/Mp4v2DecoderPlugin.hxx
+endif
+
if ENABLE_SIDPLAY
libdecoder_a_SOURCES += \
src/decoder/plugins/SidplayDecoderPlugin.cxx \