Mercurial > mplayer.hg
comparison configure @ 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 | 7bb9110fc7f4 |
| children | 8618755f2c06 |
comparison
equal
deleted
inserted
replaced
| 21360:cb8d847fab79 | 21361:be2e003cdd10 |
|---|---|
| 4584 _def_sdl='#define HAVE_SDL 1' | 4584 _def_sdl='#define HAVE_SDL 1' |
| 4585 if cygwin ; then | 4585 if cygwin ; then |
| 4586 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`" | 4586 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`" |
| 4587 _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`" | 4587 _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`" |
| 4588 elif mingw32 ; then | 4588 elif mingw32 ; then |
| 4589 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | sed s/-mwindows//`" | 4589 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//`" |
| 4590 _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`" | 4590 _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`" |
| 4591 else | 4591 else |
| 4592 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`" | 4592 _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`" |
| 4593 _inc_extra="$_inc_extra `$_sdlconfig --cflags`" | 4593 _inc_extra="$_inc_extra `$_sdlconfig --cflags`" |
| 4594 fi | 4594 fi |