[MPlayer-cygwin] [PATCH] 1st real attempt at fixing that SDL config.mak issue

[Diego Biurrun]

Sycotic Smith wrote:
 > Here is MY config.mak lines from the changes:
 > SDL_INC = -I/usr/local/include -I/usr/local/include/SDL -Uunix 
-mno-cygwin

Hmm, I only have -I/usr/local/include/SDL in my SDL_INC to begin with, 
no -I/usr/local/include, thus your patch fails for me.  When running 
MPlayer also fails to find the SDL.dll, I have to copy it to the current 
directory.  Am I missing something?  I have no idea how to set the 
library patch in Cygwin..

> Well, here is a small patch that for ME fixes almost all of the 
> changes we normally have to make by hand to config.mak.  Only thing I 
> can't figure out now, is how to cut the 'no-' from the '-mno-cygwin' 
> field.  Any ideas?  Other than that part, there is almost no more need 
> to make changes by hand...


Cutting that out is no problem with sed, how about this:

--- configure   12 Nov 2002 01:56:21 -0000      1.603
+++ configure   12 Nov 2002 23:53:04 -0000
@@ -2580,7 +2580,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
@@ -2869,8 +2873,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,2,6,7 | 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"