diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-24 16:25:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-24 16:25:56 +0000 |
| commit | 636106aee4787161a10a79d89ab89b02d16e0d13 (patch) | |
| tree | 7ba72567ebd5656505c47499298b982f945fe860 | |
| parent | e8686ca1f1eaacf515552f44a725620c18d588bc (diff) | |
| download | mpv-636106aee4787161a10a79d89ab89b02d16e0d13.tar.bz2 mpv-636106aee4787161a10a79d89ab89b02d16e0d13.tar.xz | |
Fix MEncoder build when bitmap fonts are disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19525 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | mencoder.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -39,7 +39,6 @@ SRCS_MENCODER = mencoder.c \ 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_DEPS += libass/libass.a 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) diff --git a/mencoder.c b/mencoder.c index f0c988b6e2..998d179cc4 100644 --- a/mencoder.c +++ b/mencoder.c @@ -534,6 +534,7 @@ if (frameno_filename) { 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 (frameno_filename) { if(!vo_font) vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); } +#endif #ifdef HAVE_FONTCONFIG } #endif |