From bc93e2529900f55f16a299ec91d5e084f169f242 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 30 Jun 2006 12:41:05 +0000 Subject: Move conditional FreeType support compilation to the build system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18869 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/Makefile | 5 ++++- libvo/font_load_ft.c | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'libvo') diff --git a/libvo/Makefile b/libvo/Makefile index 6e7560e699..6851f83fab 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -6,7 +6,6 @@ LIBNAME = libvo.a SRCS=aclib.c \ aspect.c \ font_load.c \ - font_load_ft.c \ geometry.c \ osd.c \ spuenc.c \ @@ -25,6 +24,10 @@ endif OBJS_TEMP=$(basename $(SRCS)) OBJS=$(OBJS_TEMP:%=%.o) +ifeq ($(FREETYPE),yes) +SRCS += font_load_ft.c +endif + ifeq ($(VIDIX),yes) SRCS += vosub_vidix.c endif diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 13e9421319..e1d475f4a8 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -11,8 +11,6 @@ #include "config.h" -#ifdef HAVE_FREETYPE - #include #include #include @@ -1170,5 +1168,3 @@ void load_font_ft(int width, int height) vo_font=read_font_desc_ft(font_name, width, height); #endif } - -#endif /* HAVE_FREETYPE */ -- cgit v1.2.3