RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 16:33:02 +00:00
Code Issues Releases Wiki Activity

Treat fontconfig and FreeType linker flags just like any other linker flag.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-21 17:20:32 +00:00
parent 2f3c36c494
commit 84cbc3b50c
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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

4
configure vendored
View File

@ -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