diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 22:40:14 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 22:40:14 +0000 |
commit | eb4fff3a8fa64c3abf63fad5a05b3f102000ce24 (patch) | |
tree | c50c75a67f88ec72a636b1f8ba54fe788d29a0c6 /configure | |
parent | b4419265d6ea2868b1d4d6c3340d21ab29ef57ba (diff) | |
download | mpv-eb4fff3a8fa64c3abf63fad5a05b3f102000ce24.tar.bz2 mpv-eb4fff3a8fa64c3abf63fad5a05b3f102000ce24.tar.xz |
dshow switched to C version
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3452 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -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' |