diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-13 22:24:28 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-13 22:24:28 +0000 |
| commit | 76ba69ec56f46b74c052415aa448b86ac0820f28 (patch) | |
| tree | dc57b4237b4c2c2b060b5d34815999ec2ed186c4 /Makefile | |
| parent | 26f0e5e4a1e9cf0b38fbcd25ab1facb8b3f22744 (diff) | |
| download | mpv-76ba69ec56f46b74c052415aa448b86ac0820f28.tar.bz2 mpv-76ba69ec56f46b74c052415aa448b86ac0820f28.tar.xz | |
Fix linking order. FontConfig should appear after libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19076 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |