Author: diego Date: Fri Jun 30 14:41:05 2006 New Revision: 18869 Modified: trunk/configure trunk/libvo/Makefile trunk/libvo/font_load_ft.c Log: Move conditional FreeType support compilation to the build system. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Jun 30 14:41:05 2006 @@ -7481,6 +7481,7 @@ DIRECTFB_LIB = $_ld_directfb CDPARANOIA_INC = $_inc_cdparanoia CDPARANOIA_LIB = $_ld_cdparanoia +FREETYPE = $_freetype FREETYPE_INC = $_inc_freetype FREETYPE_LIB = $_ld_freetype FONTCONFIG_INC = $_inc_fontconfig Modified: trunk/libvo/Makefile ============================================================================== --- trunk/libvo/Makefile (original) +++ trunk/libvo/Makefile Fri Jun 30 14:41:05 2006 @@ -6,7 +6,6 @@ SRCS=aclib.c \ aspect.c \ font_load.c \ - font_load_ft.c \ geometry.c \ osd.c \ spuenc.c \ @@ -25,6 +24,10 @@ 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 Modified: trunk/libvo/font_load_ft.c ============================================================================== --- trunk/libvo/font_load_ft.c (original) +++ trunk/libvo/font_load_ft.c Fri Jun 30 14:41:05 2006 @@ -11,8 +11,6 @@ #include "config.h" -#ifdef HAVE_FREETYPE - #include <stdio.h> #include <stdlib.h> #include <math.h> @@ -1170,5 +1168,3 @@ vo_font=read_font_desc_ft(font_name, width, height); #endif } - -#endif /* HAVE_FREETYPE */