[MPlayer-cvslog] r21377 - trunk/configure

diego subversion at mplayerhq.hu
Wed Nov 29 11:33:42 CET 2006


Author: diego
Date: Wed Nov 29 11:33:42 2006
New Revision: 21377

Modified:
   trunk/configure

Log:
`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


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Nov 29 11:33:42 2006
@@ -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`"



More information about the MPlayer-cvslog mailing list