[MPlayer-cvslog] r18987 - trunk/Makefile

[Diego Biurrun]

On Thu, Jul 13, 2006 at 09:21:21PM +0400, Evgeniy Stepanov wrote:
> On Monday 10 July 2006 02:11, diego wrote:
> > Simplify ASS handling second try, this time taking FreeType into account.
> 
> Fontconfig should also come after libass.

> --- Makefile	(revision 19067)
> +++ Makefile	(working copy)
> @@ -119,7 +119,6 @@
>                $(MACOSX_FRAMEWORKS) \
>                $(SMBSUPPORT_LIB) \
>                $(FRIBIDI_LIB) \
> -              $(FONTCONFIG_LIB) \
>                $(ENCA_LIB) \
>  
>  CFLAGS = $(OPTFLAGS) -I. \
> @@ -248,7 +247,8 @@
>  COMMON_LIBS += libass/libass.a
>  PARTS += libass
>  endif
> -# FreeType needs to come after ASS to avoid link failures on MinGW
> +# FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
> +COMMON_LIBS += $(FONTCONFIG_LIB)
>  ifeq ($(FREETYPE),yes)
>  SRCS_MENCODER += libvo/font_load_ft.c
>  COMMON_LIBS += $(FREETYPE_LIB)

Commit anytime.

Diego