Mercurial > mplayer.hg

diff Makefile @ 21128:ef9e23c5ef5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/Makefile	Tue Nov 21 16:46:31 2006 +0000
+++ b/Makefile	Tue Nov 21 17:20:32 2006 +0000
@@ -150,11 +150,6 @@
 COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif
-# FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
-COMMON_LIBS += $(FONTCONFIG_LIB)
-ifeq ($(FREETYPE),yes)
-COMMON_LIBS += $(FREETYPE_LIB)
-endif
 ifeq ($(GUI),yes)
 LIBS_MPLAYER += Gui/libgui.a
 PARTS += Gui