Mercurial > mplayer.hg

changeset 19519:1dc1c55328e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MEncoder build when bitmap fonts are disabled.
author diego
date Thu, 24 Aug 2006 16:25:56 +0000
parents 4440aa9939dc
children 46fa785e9026
files Makefile mencoder.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Aug 24 15:38:28 2006 +0000
+++ b/Makefile	Thu Aug 24 16:25:56 2006 +0000
@@ -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)
--- a/mencoder.c	Thu Aug 24 15:38:28 2006 +0000
+++ b/mencoder.c	Thu Aug 24 16:25:56 2006 +0000
@@ -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