Mercurial > mplayer.hg

comparison Makefile @ 19071:5da674b26ce1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking order. FontConfig should appear after libass.
author eugeni
date Thu, 13 Jul 2006 22:24:28 +0000
parents 6866e768aef8
children 1ea5c31932fd
comparison
equal deleted inserted replaced
19070:16990c298b7b 19071:5da674b26ce1
117 $(WIN32_LIB) \ 117 $(WIN32_LIB) \
118 $(GIF_LIB) \ 118 $(GIF_LIB) \
119 $(MACOSX_FRAMEWORKS) \ 119 $(MACOSX_FRAMEWORKS) \
120 $(SMBSUPPORT_LIB) \ 120 $(SMBSUPPORT_LIB) \
121 $(FRIBIDI_LIB) \ 121 $(FRIBIDI_LIB) \
122 $(FONTCONFIG_LIB) \
123 $(ENCA_LIB) \ 122 $(ENCA_LIB) \
124 123
125 CFLAGS = $(OPTFLAGS) -I. \ 124 CFLAGS = $(OPTFLAGS) -I. \
126 $(CACA_INC) \ 125 $(CACA_INC) \
127 $(CDPARANOIA_INC) \ 126 $(CDPARANOIA_INC) \
246 ifeq ($(CONFIG_ASS),yes) 245 ifeq ($(CONFIG_ASS),yes)
247 COMMON_DEPS += libass/libass.a 246 COMMON_DEPS += libass/libass.a
248 COMMON_LIBS += libass/libass.a 247 COMMON_LIBS += libass/libass.a
249 PARTS += libass 248 PARTS += libass
250 endif 249 endif
251 # FreeType needs to come after ASS to avoid link failures on MinGW 250 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
251 COMMON_LIBS += $(FONTCONFIG_LIB)
252 ifeq ($(FREETYPE),yes) 252 ifeq ($(FREETYPE),yes)
253 SRCS_MENCODER += libvo/font_load_ft.c 253 SRCS_MENCODER += libvo/font_load_ft.c
254 COMMON_LIBS += $(FREETYPE_LIB) 254 COMMON_LIBS += $(FREETYPE_LIB)
255 endif 255 endif
256 ifeq ($(GUI),yes) 256 ifeq ($(GUI),yes)