[Mplayer-cvslog] CVS: main configure,1.608,1.609
Diego Biurrun CVS
diego at mplayerhq.hu
Mon Nov 18 02:02:30 CET 2002
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv9484
Modified Files:
configure
Log Message:
Finally add the correct compile flags for SDL under cygwin automatically.
Patch by Sycotic Smith <sycotic at linuxmail.org> and me.
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -r1.608 -r1.609
--- configure 16 Nov 2002 14:48:13 -0000 1.608
+++ configure 18 Nov 2002 01:02:27 -0000 1.609
@@ -2590,7 +2590,11 @@
fi
if test "$_aa" = yes ; then
_def_aa='#define HAVE_AA 1'
- _ld_aa='-laa'
+ if cygwin ; then
+ _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
+ else
+ _ld_aa='-laa'
+ fi
_vosrc="$_vosrc vo_aa.c"
_vomodules="aa $_vomodules"
else
@@ -2879,8 +2883,13 @@
fi
if test "$_sdl" = yes ; then
_def_sdl='#define HAVE_SDL 1'
- _ld_sdl=`$_sdlconfig --libs`
- _inc_sdl=`$_sdlconfig --cflags`
+ if cygwin ; then
+ _ld_sdl=`$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`
+ _inc_sdl=`$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`
+ else
+ _ld_sdl=`$_sdlconfig --libs`
+ _inc_sdl=`$_sdlconfig --cflags`
+ fi
_vosrc="$_vosrc vo_sdl.c"
_vomodules="sdl $_vomodules"
_aosrc="$_aosrc ao_sdl.c"
More information about the MPlayer-cvslog
mailing list