Mercurial > mplayer.hg

comparison Makefile @ 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 a670787e51af
children 79d4ddb8fe10
comparison
equal deleted inserted replaced
18980:ed69754aa58d 18981:b6462f808403
78 $(CACA_LIB) \ 78 $(CACA_LIB) \
79 $(VESA_LIB) \ 79 $(VESA_LIB) \
80 80
81 ifeq ($(EXTERNAL_VIDIX),yes) 81 ifeq ($(EXTERNAL_VIDIX),yes)
82 VO_LIBS += $(EXTERNAL_VIDIX_LIB) 82 VO_LIBS += $(EXTERNAL_VIDIX_LIB)
83 endif
84
85 ASS_LIB =
86
87 ifeq ($(CONFIG_ASS),yes)
88 ASS_LIB += libass/libass.a
83 endif 89 endif
84 90
85 AO_LIBS = $(ARTS_LIB) \ 91 AO_LIBS = $(ARTS_LIB) \
86 $(ESD_LIB) \ 92 $(ESD_LIB) \
87 $(JACK_LIB) \ 93 $(JACK_LIB) \
111 117
112 COMMON_LIBS = libmpcodecs/libmpcodecs.a \ 118 COMMON_LIBS = libmpcodecs/libmpcodecs.a \
113 $(W32_LIB) \ 119 $(W32_LIB) \
114 libaf/libaf.a \ 120 libaf/libaf.a \
115 libmpdemux/libmpdemux.a \ 121 libmpdemux/libmpdemux.a \
122 $(ASS_LIB) \
116 libswscale/libswscale.a \ 123 libswscale/libswscale.a \
117 osdep/libosdep.a \ 124 osdep/libosdep.a \
118 $(DVDREAD_LIB) \ 125 $(DVDREAD_LIB) \
119 $(DVDNAV_LIB) \ 126 $(DVDNAV_LIB) \
120 $(CODEC_LIBS) \ 127 $(CODEC_LIBS) \
254 ifeq ($(DVDKIT2),yes) 261 ifeq ($(DVDKIT2),yes)
255 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a 262 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
256 endif 263 endif
257 ifeq ($(CONFIG_ASS),yes) 264 ifeq ($(CONFIG_ASS),yes)
258 COMMON_DEPS += libass/libass.a 265 COMMON_DEPS += libass/libass.a
259 COMMON_LIBS += libass/libass.a
260 PARTS += libass 266 PARTS += libass
261 endif 267 endif
262 268
263 ifeq ($(GUI),yes) 269 ifeq ($(GUI),yes)
264 COMMON_DEPS += Gui/libgui.a 270 COMMON_DEPS += Gui/libgui.a