summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-24 16:25:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-24 16:25:56 +0000
commit636106aee4787161a10a79d89ab89b02d16e0d13 (patch)
tree7ba72567ebd5656505c47499298b982f945fe860 /Makefile
parente8686ca1f1eaacf515552f44a725620c18d588bc (diff)
downloadmpv-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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 764ef6d617..fef234c788 100644
--- a/Makefile
+++ b/Makefile
@@ -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)