[MPlayer-cvslog] r19076 - trunk/Makefile

[eugeni]

Author: eugeni
Date: Fri Jul 14 00:24:28 2006
New Revision: 19076

Modified:
   trunk/Makefile

Log:
Fix linking order. FontConfig should appear after libass.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Jul 14 00:24:28 2006
@@ -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)