Mercurial > mplayer.hg

changeset 18982:79d4ddb8fe10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify ASS handling second try, this time taking FreeType into account.
author diego
date Sun, 09 Jul 2006 22:11:53 +0000
parents b6462f808403
children 6ffd0c1f708e
files Makefile
diffstat 1 files changed, 6 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jul 09 19:02:20 2006 +0000
+++ b/Makefile	Sun Jul 09 22:11:53 2006 +0000
@@ -60,10 +60,6 @@
 SRCS_COMMON += unrarlib.c
 endif
 
-ifeq ($(FREETYPE),yes)
-SRCS_MENCODER += libvo/font_load_ft.c
-endif
-
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
@@ -82,12 +78,6 @@
 VO_LIBS += $(EXTERNAL_VIDIX_LIB)
 endif
 
-ASS_LIB =
-
-ifeq ($(CONFIG_ASS),yes)
-ASS_LIB += libass/libass.a
-endif
-
 AO_LIBS = $(ARTS_LIB) \
           $(ESD_LIB) \
           $(JACK_LIB) \
@@ -119,13 +109,11 @@
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
-              $(ASS_LIB) \
               libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
               $(DVDNAV_LIB) \
               $(CODEC_LIBS) \
-              $(FREETYPE_LIB) \
               $(TERMCAP_LIB) \
               $(CDPARANOIA_LIB) \
               $(MPLAYER_NETWORK_LIB) \
@@ -263,9 +251,14 @@
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
+COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif
-
+# FreeType needs to come after ASS to avoid link failures on MinGW
+ifeq ($(FREETYPE),yes)
+SRCS_MENCODER += libvo/font_load_ft.c
+COMMON_LIBS += $(FREETYPE_LIB)
+endif
 ifeq ($(GUI),yes)
 COMMON_DEPS += Gui/libgui.a
 GUI_LIBS = Gui/libgui.a