[Mplayer-cvslog] CVS: main/Gui Makefile,1.10,1.11 interface.c,1.40,1.41

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv17935/Gui

Modified Files:
	Makefile interface.c 
Log Message:
freetype 2.0/2.1+ support - disabled by default until bugs fixed
patch by Jindrich Makovicka <makovick at kmlinux.fjfi.cvut.cz>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	11 Aug 2002 13:12:37 -0000	1.10
+++ Makefile	28 Aug 2002 20:52:00 -0000	1.11
@@ -4,7 +4,7 @@
 include ../config.mak
 include config.mak
 
-INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC) $(EXTRA_INC)
+INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC) $(EXTRA_INC) $(FREETYPE_INC)
 
 OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
             -fexpensive-optimizations -fschedule-insns2 -Wall

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- interface.c	28 Aug 2002 15:55:56 -0000	1.40
+++ interface.c	28 Aug 2002 20:52:00 -0000	1.41
@@ -201,6 +201,9 @@
 #if defined( USE_OSD ) || defined( USE_SUB )
 void guiLoadFont( void )
 {
+#ifdef HAVE_FREETYPE
+  load_font(vo_image_width, vo_image_height);
+#else
  if ( vo_font )
   {
    int i;
@@ -235,6 +238,7 @@
       vo_font=read_font_desc( font_name,font_factor,0 );
      }
    }
+#endif
 }
 #endif