# HG changeset patch
# User diego
# Date 1164129632 0
# Node ID ef9e23c5ef5b956238fc05b355638fd76ab135c0
# Parent  15c27b17476c2a07fc8dcf2d24547fd176a3d66a
Treat fontconfig and FreeType linker flags just like any other linker flag.

diff -r 15c27b17476c -r ef9e23c5ef5b Makefile
--- a/Makefile	Tue Nov 21 16:46:31 2006 +0000
+++ b/Makefile	Tue Nov 21 17:20:32 2006 +0000
@@ -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
diff -r 15c27b17476c -r ef9e23c5ef5b configure
--- a/configure	Tue Nov 21 16:46:31 2006 +0000
+++ b/configure	Tue Nov 21 17:20:32 2006 +0000
@@ -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