[MPlayer-cvslog] r18980 - trunk/Makefile

[Evgeniy Stepanov]

On Sunday 09 July 2006 19:42, diego wrote:
> Author: diego
> Date: Sun Jul  9 17:42:26 2006
> New Revision: 18980
>
> Modified:
>    trunk/Makefile
>
> Log:
> Simplify ASS handling.
>
>
> Modified: trunk/Makefile
> ===========================================================================
>=== --- trunk/Makefile	(original)
> +++ trunk/Makefile	Sun Jul  9 17:42:26 2006
> @@ -82,12 +82,6 @@
>  VO_LIBS += $(EXTERNAL_VIDIX_LIB)
>  endif
>
> -ASS_LIB =
> -
> -ifeq ($(CONFIG_ASS),yes)
> -ASS_LIB += libass/libass.a
> -endif
> -
>  AO_LIBS = $(ARTS_LIB) \
>            $(ESD_LIB) \
>            $(JACK_LIB) \
> @@ -119,7 +113,6 @@
>                $(W32_LIB) \
>                libaf/libaf.a \
>                libmpdemux/libmpdemux.a \
> -              $(ASS_LIB) \
>                libswscale/libswscale.a \
>                osdep/libosdep.a \
>                $(DVDREAD_LIB) \
> @@ -263,6 +256,7 @@
>  endif
>  ifeq ($(CONFIG_ASS),yes)
>  COMMON_DEPS += libass/libass.a
> +COMMON_LIBS += libass/libass.a
>  PARTS += libass
>  endif

This surely breaks MinGW compilation. FreeType and FontConfig are static libs 
there, linking order is important.