diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-09 19:02:20 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-09 19:02:20 +0000 |
| commit | 1b2b9d0d22b65b90e1b71f08bc803154c85ca814 (patch) | |
| tree | e4585bc008f39c94c2832fbdb1465d9ea7d53351 /Makefile | |
| parent | 4728357b58f053c28abf9bfb5e938f4dc7556790 (diff) | |
| download | mpv-1b2b9d0d22b65b90e1b71f08bc803154c85ca814.tar.bz2 mpv-1b2b9d0d22b65b90e1b71f08bc803154c85ca814.tar.xz | |
Revert r18980, it breaks compilation under MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18986 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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 |