Author: diego Date: Tue Nov 21 18:20:32 2006 New Revision: 21144 Modified: trunk/Makefile trunk/configure Log: Treat fontconfig and FreeType linker flags just like any other linker flag. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Nov 21 18:20:32 2006 @@ -150,11 +150,6 @@ COMMON_LIBS += libass/libass.a PARTS += libass endif -# FontConfig and FreeType need to come after ASS to avoid link failures on MinGW -COMMON_LIBS += $(FONTCONFIG_LIB) -ifeq ($(FREETYPE),yes) -COMMON_LIBS += $(FREETYPE_LIB) -endif ifeq ($(GUI),yes) LIBS_MPLAYER += Gui/libgui.a PARTS += Gui Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Nov 21 18:20:32 2006 @@ -7360,11 +7360,9 @@ $_ld_static \ $_ld_lm $_ld_gif \ $_ld_vorbis $_ld_theora $_xmms_lib \ - $_ld_arch + $_ld_arch $_ld_freetype $_ld_fontconfig EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib EXTRALIBS_MENCODER = $_libs_mencoder -FREETYPE_LIB = $_ld_freetype -FONTCONFIG_LIB = $_ld_fontconfig HAVE_MLIB = $_mlib HAVE_PTHREADS = $_pthreads