Mercurial > mplayer.hg
changeset 21361:be2e003cdd10
`sdl-config --libs` under mingw32 will give -lmingw32, which leads to
multiple definition of main and causes subsequent feature checks to fail.
patch by Zuxy Meng, zuxy.meng gmail com
| author | diego |
|---|---|
| date | Wed, 29 Nov 2006 10:33:42 +0000 |
| parents | cb8d847fab79 |
| children | 76f120c4e0f1 |
| files | configure |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Nov 29 10:24:43 2006 +0000 +++ b/configure Wed Nov 29 10:33:42 2006 +0000 @@ -4586,7 +4586,7 @@ _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`" _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`" elif mingw32 ; then - _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | sed s/-mwindows//`" + _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//`" _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`" else _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"