Treat fontconfig and FreeType linker flags just like any other linker flag.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 1 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index bf1d4a5456..3021baea84 100644
--- a/Makefile
+++ b/Makefile
@@ -150,11 +150,6 @@ ifeq ($(CONFIG_ASS),yes)
 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 --git a/configure b/configure
index 85170b43b2..3b378a0f95 100755
--- a/configure
+++ b/configure
@@ -7360,11 +7360,9 @@ EXTRA_LIB = $_ld_extra \
   $_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