1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 12:55:16 +00:00

dshow switched to C version

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3452 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-12-10 22:40:14 +00:00
parent b4419265d6
commit eb4fff3a8f
2 changed files with 17 additions and 9 deletions

View File

@ -57,7 +57,7 @@ PARTS += Gui
endif
ifneq ($(W32_LIB),)
PARTS += loader loader/DirectShow
PARTS += loader loader/dshow
SRCS_MPLAYER += dll_init.c
SRCS_MENCODER += dll_init.c
# SRCS += dll_init.c
@ -101,6 +101,9 @@ libmpdemux/libmpdemux.a:
loader/DirectShow/libDS_Filter.a:
$(MAKE) -C loader/DirectShow
loader/dshow/libDS_Filter.a:
$(MAKE) -C loader/dshow
libmp1e/libmp1e.a:
$(MAKE) -C libmp1e

21
configure vendored
View File

@ -674,7 +674,7 @@ _sunaudio=auto
_alsa=auto
_fastmemcpy=yes
_win32=auto
_dshow=auto
_dshow=yes
_select=yes
_tv=yes
_tv_v4l=auto
@ -2126,12 +2126,15 @@ if test "$_win32" = yes ; then
echores "$_win32 (found: $_win32libdir)"
else
_def_win32='#undef USE_WIN32DLL'
_dshow=no
echores "$_win32"
fi
echocheck "DirectShow"
if test "$_win32" = yes && test "$_dshow" = auto ; then
if false ; then
if test "$_dshow" != no ; then
_dshow=no
# check if compiler supports C++ and C++-libs are installed correctly
cat > "$TMPCPP" << EOF
@ -2165,14 +2168,16 @@ to disable building of the C++ based DirectShow code.
EOF
die "$_cc's C++ is broken"
fi
else
_dshow=no
echores "$_dshow"
fi
fi
echores "$_dshow"
if test "$_dshow" = yes ; then
_def_dshow='#define USE_DIRECTSHOW 1'
_ld_dshow='-Lloader/DirectShow -lDS_Filter -lstdc++'
_dep_dshow='loader/DirectShow/libDS_Filter.a'
_ld_dshow='-Lloader/dshow -lDS_Filter'
_dep_dshow='loader/dshow/libDS_Filter.a'
_codecmodules="directshow $_codecmodules"
else
_def_dshow='#undef USE_DIRECTSHOW'