Mercurial > mplayer.hg

changeset 18981:b6462f808403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r18980, it breaks compilation under MinGW.
author eugeni
date Sun, 09 Jul 2006 19:02:20 +0000
parents ed69754aa58d
children 79d4ddb8fe10
files Makefile
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jul 09 17:45:36 2006 +0000
+++ b/Makefile	Sun Jul 09 19:02:20 2006 +0000
@@ -82,6 +82,12 @@
 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) \
@@ -113,6 +119,7 @@
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
+              $(ASS_LIB) \
               libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
@@ -256,7 +263,6 @@
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
-COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif