# HG changeset patch # User eugeni # Date 1152829468 0 # Node ID 5da674b26ce1f89cfd682bee9a7ab2b60267491b # Parent 16990c298b7be9bc760f722894b7d74b7de03655 Fix linking order. FontConfig should appear after libass. diff -r 16990c298b7b -r 5da674b26ce1 Makefile --- 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)