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

[Sycotic Smith]

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...
Also, a small change to aalib that seems to be overlooked for our target, or am I adding these in an unnecessary place?  

Here is MY config.mak lines from the changes:
SDL_LIB = -L/usr/local/lib -lSDL -mno-cygwin
AA_LIB = -laa -lX11 -lncurses
SDL_INC = -I/usr/local/include -I/usr/local/include/SDL -Uunix -mno-cygwin

/S. Smith

(Patch also attached in case formatting gets munged.)
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.603
diff -u -r1.603 configure
--- 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`
+    _inc_sdl=`$_sdlconfig --cflags | cut -d " " -f 1,2,6,7`
+  else
+    _ld_sdl=`$_sdlconfig --libs`
+    _inc_sdl=`$_sdlconfig --cflags`
+  fi
   _vosrc="$_vosrc vo_sdl.c"
   _vomodules="sdl $_vomodules"
   _aosrc="$_aosrc ao_sdl.c"

-- 
______________________________________________
http://www.linuxmail.org/
Now with POP3/IMAP access for only US$19.95/yr

Powered by Outblaze
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sdl-aa-diff.txt.bz2
Type: application/octet-stream
Size: 495 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cygwin/attachments/20021112/c38155d7/attachment.obj>