Mercurial > mplayer.hg
comparison Makefile @ 19519:1dc1c55328e2
Fix MEncoder build when bitmap fonts are disabled.
| author | diego |
|---|---|
| date | Thu, 24 Aug 2006 16:25:56 +0000 |
| parents | 3b869f58b027 |
| children | 8220d48531ae |
comparison
equal
deleted
inserted
replaced
| 19518:4440aa9939dc | 19519:1dc1c55328e2 |
|---|---|
| 37 | 37 |
| 38 SRCS_MENCODER = mencoder.c \ | 38 SRCS_MENCODER = mencoder.c \ |
| 39 mp_msg-mencoder.c \ | 39 mp_msg-mencoder.c \ |
| 40 $(SRCS_COMMON) \ | 40 $(SRCS_COMMON) \ |
| 41 libvo/aclib.c \ | 41 libvo/aclib.c \ |
| 42 libvo/font_load.c \ | |
| 43 libvo/osd.c \ | 42 libvo/osd.c \ |
| 44 libvo/sub.c \ | 43 libvo/sub.c \ |
| 45 parser-mecmd.c \ | 44 parser-mecmd.c \ |
| 46 xvid_vbr.c \ | 45 xvid_vbr.c \ |
| 47 | 46 |
| 245 ifeq ($(CONFIG_ASS),yes) | 244 ifeq ($(CONFIG_ASS),yes) |
| 246 COMMON_DEPS += libass/libass.a | 245 COMMON_DEPS += libass/libass.a |
| 247 COMMON_LIBS += libass/libass.a | 246 COMMON_LIBS += libass/libass.a |
| 248 PARTS += libass | 247 PARTS += libass |
| 249 endif | 248 endif |
| 249 ifeq ($(BITMAP_FONT),yes) | |
| 250 SRCS_MENCODER += libvo/font_load.c | |
| 251 endif | |
| 250 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW | 252 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW |
| 251 COMMON_LIBS += $(FONTCONFIG_LIB) | 253 COMMON_LIBS += $(FONTCONFIG_LIB) |
| 252 ifeq ($(FREETYPE),yes) | 254 ifeq ($(FREETYPE),yes) |
| 253 SRCS_MENCODER += libvo/font_load_ft.c | 255 SRCS_MENCODER += libvo/font_load_ft.c |
| 254 COMMON_LIBS += $(FREETYPE_LIB) | 256 COMMON_LIBS += $(FREETYPE_LIB) |