Mercurial > mplayer.hg

comparison Makefile @ 18982:79d4ddb8fe10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify ASS handling second try, this time taking FreeType into account.
author diego
date Sun, 09 Jul 2006 22:11:53 +0000
parents b6462f808403
children f0e9de2b3780
comparison
equal deleted inserted replaced
18981:b6462f808403 18982:79d4ddb8fe10
58 58
59 ifeq ($(UNRARLIB),yes) 59 ifeq ($(UNRARLIB),yes)
60 SRCS_COMMON += unrarlib.c 60 SRCS_COMMON += unrarlib.c
61 endif 61 endif
62 62
63 ifeq ($(FREETYPE),yes)
64 SRCS_MENCODER += libvo/font_load_ft.c
65 endif
66
67 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) 63 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
68 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 64 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
69 65
70 VO_LIBS = $(AA_LIB) \ 66 VO_LIBS = $(AA_LIB) \
71 $(X_LIB) \ 67 $(X_LIB) \
78 $(CACA_LIB) \ 74 $(CACA_LIB) \
79 $(VESA_LIB) \ 75 $(VESA_LIB) \
80 76
81 ifeq ($(EXTERNAL_VIDIX),yes) 77 ifeq ($(EXTERNAL_VIDIX),yes)
82 VO_LIBS += $(EXTERNAL_VIDIX_LIB) 78 VO_LIBS += $(EXTERNAL_VIDIX_LIB)
83 endif
84
85 ASS_LIB =
86
87 ifeq ($(CONFIG_ASS),yes)
88 ASS_LIB += libass/libass.a
89 endif 79 endif
90 80
91 AO_LIBS = $(ARTS_LIB) \ 81 AO_LIBS = $(ARTS_LIB) \
92 $(ESD_LIB) \ 82 $(ESD_LIB) \
93 $(JACK_LIB) \ 83 $(JACK_LIB) \
117 107
118 COMMON_LIBS = libmpcodecs/libmpcodecs.a \ 108 COMMON_LIBS = libmpcodecs/libmpcodecs.a \
119 $(W32_LIB) \ 109 $(W32_LIB) \
120 libaf/libaf.a \ 110 libaf/libaf.a \
121 libmpdemux/libmpdemux.a \ 111 libmpdemux/libmpdemux.a \
122 $(ASS_LIB) \
123 libswscale/libswscale.a \ 112 libswscale/libswscale.a \
124 osdep/libosdep.a \ 113 osdep/libosdep.a \
125 $(DVDREAD_LIB) \ 114 $(DVDREAD_LIB) \
126 $(DVDNAV_LIB) \ 115 $(DVDNAV_LIB) \
127 $(CODEC_LIBS) \ 116 $(CODEC_LIBS) \
128 $(FREETYPE_LIB) \
129 $(TERMCAP_LIB) \ 117 $(TERMCAP_LIB) \
130 $(CDPARANOIA_LIB) \ 118 $(CDPARANOIA_LIB) \
131 $(MPLAYER_NETWORK_LIB) \ 119 $(MPLAYER_NETWORK_LIB) \
132 $(LIBCDIO_LIB) \ 120 $(LIBCDIO_LIB) \
133 $(WIN32_LIB) \ 121 $(WIN32_LIB) \
261 ifeq ($(DVDKIT2),yes) 249 ifeq ($(DVDKIT2),yes)
262 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a 250 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
263 endif 251 endif
264 ifeq ($(CONFIG_ASS),yes) 252 ifeq ($(CONFIG_ASS),yes)
265 COMMON_DEPS += libass/libass.a 253 COMMON_DEPS += libass/libass.a
254 COMMON_LIBS += libass/libass.a
266 PARTS += libass 255 PARTS += libass
267 endif 256 endif
268 257 # FreeType needs to come after ASS to avoid link failures on MinGW
258 ifeq ($(FREETYPE),yes)
259 SRCS_MENCODER += libvo/font_load_ft.c
260 COMMON_LIBS += $(FREETYPE_LIB)
261 endif
269 ifeq ($(GUI),yes) 262 ifeq ($(GUI),yes)
270 COMMON_DEPS += Gui/libgui.a 263 COMMON_DEPS += Gui/libgui.a
271 GUI_LIBS = Gui/libgui.a 264 GUI_LIBS = Gui/libgui.a
272 endif 265 endif
273 266