From 1b2b9d0d22b65b90e1b71f08bc803154c85ca814 Mon Sep 17 00:00:00 2001
From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 9 Jul 2006 19:02:20 +0000
Subject: Revert r18980, it breaks compilation under MinGW.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18986 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a9c053be51..2ed2853e05 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,12 @@ ifeq ($(EXTERNAL_VIDIX),yes)
 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 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
+              $(ASS_LIB) \
               libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
@@ -256,7 +263,6 @@ COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
-COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif
 
-- 
cgit v1.2.3