diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 17:20:32 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 17:20:32 +0000 |
| commit | 84cbc3b50ce95ef1de66d724d6a4cb9f193af6eb (patch) | |
| tree | 9cc2851dcf13f623960130982838edc33aaa836b | |
| parent | 2f3c36c494bb9da21cec5c66582d1c20860e87ca (diff) | |
| download | mpv-84cbc3b50ce95ef1de66d724d6a4cb9f193af6eb.tar.bz2 mpv-84cbc3b50ce95ef1de66d724d6a4cb9f193af6eb.tar.xz | |
Treat fontconfig and FreeType linker flags just like any other linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 1 insertions, 8 deletions
@@ -150,11 +150,6 @@ ifeq ($(CONFIG_ASS),yes) 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 @@ -7360,11 +7360,9 @@ EXTRA_LIB = $_ld_extra \ $_ld_static \ $_ld_lm $_ld_gif \ $_ld_vorbis $_ld_theora $_xmms_lib \ - $_ld_arch + $_ld_arch $_ld_freetype $_ld_fontconfig EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_x11 $_ld_sock $_ld_static $_ld_gtk $_ld_glib EXTRALIBS_MENCODER = $_libs_mencoder -FREETYPE_LIB = $_ld_freetype -FONTCONFIG_LIB = $_ld_fontconfig HAVE_MLIB = $_mlib HAVE_PTHREADS = $_pthreads |