Mercurial > mplayer.hg

diff Makefile @ 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 3b869f58b027
children 8220d48531ae
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)