[MPlayer-cvslog] r19525 - in trunk: Makefile mencoder.c

[diego]

Author: diego
Date: Thu Aug 24 18:25:56 2006
New Revision: 19525

Modified:
   trunk/Makefile
   trunk/mencoder.c

Log:
Fix MEncoder build when bitmap fonts are disabled.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Aug 24 18:25:56 2006
@@ -39,7 +39,6 @@
                 mp_msg-mencoder.c \
                 $(SRCS_COMMON) \
                 libvo/aclib.c \
-                libvo/font_load.c \
                 libvo/osd.c \
                 libvo/sub.c \
                 parser-mecmd.c \
@@ -247,6 +246,9 @@
 COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif
+ifeq ($(BITMAP_FONT),yes)
+SRCS_MENCODER += libvo/font_load.c
+endif
 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
 COMMON_LIBS += $(FONTCONFIG_LIB)
 ifeq ($(FREETYPE),yes)

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Thu Aug 24 18:25:56 2006
@@ -534,6 +534,7 @@
   if(!font_fontconfig)
   {
 #endif
+#ifdef HAVE_BITMAP_FONT
   if(font_name){
        vo_font=read_font_desc(font_name,font_factor,verbose>1);
        if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
@@ -543,6 +544,7 @@
        if(!vo_font)
        vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
   }
+#endif
 #ifdef HAVE_FONTCONFIG
   }
 #endif