summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-05 15:17:16 +0200
committerwm4 <wm4@nowhere>2012-10-05 15:26:31 +0200
commitabc0ab8f618afe9474d580c3d7f496e487c0e32d (patch)
treed1c39ed17931e62ac7f3f917de34f1659e03a855 /Makefile
parentbc97dab8860077834d3e0939cf97726366d7d4f5 (diff)
downloadmpv-abc0ab8f618afe9474d580c3d7f496e487c0e32d.tar.bz2
mpv-abc0ab8f618afe9474d580c3d7f496e487c0e32d.tar.xz
build: fix ao_dsound config checks
ao_dsound.c depended on the same configure check as vo_directx.c, which was removed in commit 0e2c48a3ce19. This accidentally disabled inclusion of ao_dsound. Fix it by adding a new check. Also, move it below ao_portaudio on the auto-select list, as ao_dsound is considered deprecated. Unrelated to that, move ao_lavc below ao_null to prevent it from being auto-selected.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 26b6178b17..016f256635 100644
--- a/Makefile
+++ b/Makefile
@@ -233,6 +233,7 @@ SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c
+SRCS_MPLAYER-$(DSOUND) += libao2/ao_dsound.c
SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_opengl.c \
libvo/vo_opengl_old.c pnm_loader.c
SRCS_MPLAYER-$(ENCODING) += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c