Mercurial > mplayer.hg
changeset 3451:e972025d1c46
dshow switched to C version
| author | arpi |
|---|---|
| date | Mon, 10 Dec 2001 22:40:14 +0000 |
| parents | d42b541da88a |
| children | 13e10af31af6 |
| files | Makefile configure |
| diffstat | 2 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Dec 10 22:21:09 2001 +0000 +++ b/Makefile Mon Dec 10 22:40:14 2001 +0000 @@ -57,7 +57,7 @@ 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 @@ loader/DirectShow/libDS_Filter.a: $(MAKE) -C loader/DirectShow +loader/dshow/libDS_Filter.a: + $(MAKE) -C loader/dshow + libmp1e/libmp1e.a: $(MAKE) -C libmp1e
--- a/configure Mon Dec 10 22:21:09 2001 +0000 +++ b/configure Mon Dec 10 22:40:14 2001 +0000 @@ -674,7 +674,7 @@ _alsa=auto _fastmemcpy=yes _win32=auto -_dshow=auto +_dshow=yes _select=yes _tv=yes _tv_v4l=auto @@ -2126,12 +2126,15 @@ 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 @@ 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'