RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix linking order. FontConfig should appear after libass. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19076 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2006-07-13 22:24:28 +00:00
parent 26f0e5e4a1
commit 76ba69ec56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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)