[MPlayer-cvslog] r18986 - trunk/Makefile

[eugeni]

Author: eugeni
Date: Sun Jul  9 21:02:20 2006
New Revision: 18986

Modified:
   trunk/Makefile

Log:
Revert r18980, it breaks compilation under MinGW.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Jul  9 21:02:20 2006
@@ -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