diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-29 10:33:42 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-29 10:33:42 +0000 |
| commit | 6add846d7c852d9ed8f1c3eb6650e37af6ac728d (patch) | |
| tree | a5c70687f7b06b6b356de973244622691583a211 /configure | |
| parent | b138036098bb2e9a8fe71308dbd86613e6b38053 (diff) | |
| download | mpv-6add846d7c852d9ed8f1c3eb6650e37af6ac728d.tar.bz2 mpv-6add846d7c852d9ed8f1c3eb6650e37af6ac728d.tar.xz | |
`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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21377 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4586,7 +4586,7 @@ if test "$_sdl" = yes ; then _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`" |