Mercurial > mplayer.hg
comparison Makefile @ 21128:ef9e23c5ef5b
Treat fontconfig and FreeType linker flags just like any other linker flag.
author | diego |
---|---|
date | Tue, 21 Nov 2006 17:20:32 +0000 |
parents | 2e0938ba9756 |
children | 44dcb71f9751 |
comparison
equal
deleted
inserted
replaced
21127:15c27b17476c | 21128:ef9e23c5ef5b |
---|---|
147 PARTS += libdvdcss | 147 PARTS += libdvdcss |
148 endif | 148 endif |
149 ifeq ($(CONFIG_ASS),yes) | 149 ifeq ($(CONFIG_ASS),yes) |
150 COMMON_LIBS += libass/libass.a | 150 COMMON_LIBS += libass/libass.a |
151 PARTS += libass | 151 PARTS += libass |
152 endif | |
153 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW | |
154 COMMON_LIBS += $(FONTCONFIG_LIB) | |
155 ifeq ($(FREETYPE),yes) | |
156 COMMON_LIBS += $(FREETYPE_LIB) | |
157 endif | 152 endif |
158 ifeq ($(GUI),yes) | 153 ifeq ($(GUI),yes) |
159 LIBS_MPLAYER += Gui/libgui.a | 154 LIBS_MPLAYER += Gui/libgui.a |
160 PARTS += Gui | 155 PARTS += Gui |
161 endif | 156 endif |