From 76ba69ec56f46b74c052415aa448b86ac0820f28 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 13 Jul 2006 22:24:28 +0000 Subject: [PATCH] Fix linking order. FontConfig should appear after libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19076 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 848a8e29ff..9cb2936902 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ $(MACOSX_FRAMEWORKS) \ $(SMBSUPPORT_LIB) \ $(FRIBIDI_LIB) \ - $(FONTCONFIG_LIB) \ $(ENCA_LIB) \ CFLAGS = $(OPTFLAGS) -I. \ @@ -248,7 +247,8 @@ COMMON_DEPS += libass/libass.a 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)