Mercurial > mplayer.hg

changeset 19071:5da674b26ce1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking order. FontConfig should appear after libass.
author eugeni
date Thu, 13 Jul 2006 22:24:28 +0000
parents 16990c298b7b
children e6f5f7c26166
files Makefile
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Jul 13 22:11:47 2006 +0000
+++ b/Makefile	Thu Jul 13 22:24:28 2006 +0000
@@ -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)