mirror of https://github.com/mpv-player/mpv
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:
parent
26f0e5e4a1
commit
76ba69ec56
4
Makefile
4
Makefile
|
@ -119,7 +119,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
|
||||||
$(MACOSX_FRAMEWORKS) \
|
$(MACOSX_FRAMEWORKS) \
|
||||||
$(SMBSUPPORT_LIB) \
|
$(SMBSUPPORT_LIB) \
|
||||||
$(FRIBIDI_LIB) \
|
$(FRIBIDI_LIB) \
|
||||||
$(FONTCONFIG_LIB) \
|
|
||||||
$(ENCA_LIB) \
|
$(ENCA_LIB) \
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I. \
|
CFLAGS = $(OPTFLAGS) -I. \
|
||||||
|
@ -248,7 +247,8 @@ COMMON_DEPS += libass/libass.a
|
||||||
COMMON_LIBS += libass/libass.a
|
COMMON_LIBS += libass/libass.a
|
||||||
PARTS += libass
|
PARTS += libass
|
||||||
endif
|
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)
|
ifeq ($(FREETYPE),yes)
|
||||||
SRCS_MENCODER += libvo/font_load_ft.c
|
SRCS_MENCODER += libvo/font_load_ft.c
|
||||||
COMMON_LIBS += $(FREETYPE_LIB)
|
COMMON_LIBS += $(FREETYPE_LIB)
|
||||||
|
|
Loading…
Reference in New Issue