summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-18 18:54:42 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-18 18:54:42 +0200
commitefcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch)
treeeb15edb75377eedd5d7397209e8c0d594020663e /Makefile
parent1598302be65c77c107330dc46fd0dabface3112d (diff)
parent8fcbe5835d038649e70da410d46c4f5cd502c261 (diff)
downloadmpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2
mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz
Merge svn changes up to r30055
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b50448a1be..d2363bbb13 100644
--- a/Makefile
+++ b/Makefile
@@ -269,7 +269,10 @@ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \
stream/frequencies.c stream/tvi_dummy.c
SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c
-SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c
+SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c \
+ loader/dshow/guids.c \
+ loader/dshow/mediatype.c \
+
SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c