summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 18:02:05 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 18:02:05 +0200
commite62517ef6a8d23cd78325a9661f8865bd222e004 (patch)
tree76b7a0af867236c2989ceca1cffcae541ceda9c5 /Makefile
parent62dda60800a902fdaf9b0ec63d8488aaa48c485f (diff)
parent27b167bb75b908541563bab964e97b06d621f837 (diff)
downloadmpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.bz2
mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.xz
Merge svn changes up to r28065
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e552e1d644..6a9793a9cf 100644
--- a/Makefile
+++ b/Makefile
@@ -375,6 +375,7 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
libmpdemux/demux_rtp_codec.cpp \
stream/stream_live555.c
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
+SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \