Mercurial > mplayer.hg
comparison Makefile @ 19523:8220d48531ae
cosmetics: Move some parts to more sensible places.
author | diego |
---|---|
date | Fri, 25 Aug 2006 13:15:49 +0000 |
parents | 1dc1c55328e2 |
children | 771698922515 |
comparison
equal
deleted
inserted
replaced
19522:0aba40fe27e1 | 19523:8220d48531ae |
---|---|
11 LIBAV_INC += -I./libavutil | 11 LIBAV_INC += -I./libavutil |
12 endif | 12 endif |
13 ifeq ($(CONFIG_LIBAVCODEC),yes) | 13 ifeq ($(CONFIG_LIBAVCODEC),yes) |
14 LIBAV_INC += -I./libavcodec | 14 LIBAV_INC += -I./libavcodec |
15 endif | 15 endif |
16 | |
17 CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) | |
18 | |
19 #CFLAGS += -Wall | |
16 | 20 |
17 # Do not strip the binaries at installation | 21 # Do not strip the binaries at installation |
18 ifeq ($(STRIPBINARIES),yes) | 22 ifeq ($(STRIPBINARIES),yes) |
19 INSTALLSTRIP = -s | 23 INSTALLSTRIP = -s |
20 endif | 24 endif |
33 spudec.c \ | 37 spudec.c \ |
34 sub_cc.c \ | 38 sub_cc.c \ |
35 subreader.c \ | 39 subreader.c \ |
36 vobsub.c \ | 40 vobsub.c \ |
37 | 41 |
42 ifeq ($(UNRARLIB),yes) | |
43 SRCS_COMMON += unrarlib.c | |
44 endif | |
45 | |
38 SRCS_MENCODER = mencoder.c \ | 46 SRCS_MENCODER = mencoder.c \ |
39 mp_msg-mencoder.c \ | 47 mp_msg-mencoder.c \ |
40 $(SRCS_COMMON) \ | 48 $(SRCS_COMMON) \ |
41 libvo/aclib.c \ | 49 libvo/aclib.c \ |
42 libvo/osd.c \ | 50 libvo/osd.c \ |
43 libvo/sub.c \ | 51 libvo/sub.c \ |
44 parser-mecmd.c \ | 52 parser-mecmd.c \ |
45 xvid_vbr.c \ | 53 xvid_vbr.c \ |
46 | 54 |
55 ifeq ($(BITMAP_FONT),yes) | |
56 SRCS_MENCODER += libvo/font_load.c | |
57 endif | |
58 | |
47 SRCS_MPLAYER = mplayer.c \ | 59 SRCS_MPLAYER = mplayer.c \ |
48 m_property.c \ | 60 m_property.c \ |
49 mp_msg.c \ | 61 mp_msg.c \ |
50 $(SRCS_COMMON) \ | 62 $(SRCS_COMMON) \ |
51 mixer.c \ | 63 mixer.c \ |
52 parser-mpcmd.c \ | 64 parser-mpcmd.c \ |
53 subopt-helper.c \ | 65 subopt-helper.c \ |
54 | |
55 ifeq ($(UNRARLIB),yes) | |
56 SRCS_COMMON += unrarlib.c | |
57 endif | |
58 | 66 |
59 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) | 67 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) |
60 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) | 68 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) |
61 | 69 |
62 VO_LIBS = $(AA_LIB) \ | 70 VO_LIBS = $(AA_LIB) \ |
100 $(ALSA_LIB) \ | 108 $(ALSA_LIB) \ |
101 $(XMMS_LIB) \ | 109 $(XMMS_LIB) \ |
102 $(X264_LIB) \ | 110 $(X264_LIB) \ |
103 $(MUSEPACK_LIB) \ | 111 $(MUSEPACK_LIB) \ |
104 $(SPEEX_LIB) \ | 112 $(SPEEX_LIB) \ |
113 | |
114 ifeq ($(TOOLAME),yes) | |
115 CFLAGS += $(TOOLAME_EXTRAFLAGS) | |
116 CODEC_LIBS += $(TOOLAME_LIB) | |
117 endif | |
118 | |
119 ifeq ($(TWOLAME),yes) | |
120 CODEC_LIBS += $(TWOLAME_LIB) | |
121 endif | |
122 | |
123 ifeq ($(FAAC),yes) | |
124 CODEC_LIBS += $(FAAC_LIB) | |
125 endif | |
105 | 126 |
106 COMMON_LIBS = libmpcodecs/libmpcodecs.a \ | 127 COMMON_LIBS = libmpcodecs/libmpcodecs.a \ |
107 $(W32_LIB) \ | 128 $(W32_LIB) \ |
108 libaf/libaf.a \ | 129 libaf/libaf.a \ |
109 libmpdemux/libmpdemux.a \ | 130 libmpdemux/libmpdemux.a \ |
128 $(LIRCC_LIB) \ | 149 $(LIRCC_LIB) \ |
129 $(ARCH_LIB) \ | 150 $(ARCH_LIB) \ |
130 $(MATH_LIB) \ | 151 $(MATH_LIB) \ |
131 $(LIBC_LIB) \ | 152 $(LIBC_LIB) \ |
132 | 153 |
133 CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) | |
134 | |
135 #CFLAGS += -Wall | |
136 | |
137 ifeq ($(TOOLAME),yes) | |
138 CFLAGS += $(TOOLAME_EXTRAFLAGS) | |
139 CODEC_LIBS += $(TOOLAME_LIB) | |
140 endif | |
141 | |
142 ifeq ($(TWOLAME),yes) | |
143 CODEC_LIBS += $(TWOLAME_LIB) | |
144 endif | |
145 | |
146 ifeq ($(FAAC),yes) | |
147 CODEC_LIBS += $(FAAC_LIB) | |
148 endif | |
149 | |
150 PARTS = libmpdemux \ | 154 PARTS = libmpdemux \ |
151 stream \ | 155 stream \ |
152 libmpcodecs \ | 156 libmpcodecs \ |
153 libavutil \ | 157 libavutil \ |
154 libavcodec \ | 158 libavcodec \ |
243 endif | 247 endif |
244 ifeq ($(CONFIG_ASS),yes) | 248 ifeq ($(CONFIG_ASS),yes) |
245 COMMON_DEPS += libass/libass.a | 249 COMMON_DEPS += libass/libass.a |
246 COMMON_LIBS += libass/libass.a | 250 COMMON_LIBS += libass/libass.a |
247 PARTS += libass | 251 PARTS += libass |
248 endif | |
249 ifeq ($(BITMAP_FONT),yes) | |
250 SRCS_MENCODER += libvo/font_load.c | |
251 endif | 252 endif |
252 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW | 253 # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW |
253 COMMON_LIBS += $(FONTCONFIG_LIB) | 254 COMMON_LIBS += $(FONTCONFIG_LIB) |
254 ifeq ($(FREETYPE),yes) | 255 ifeq ($(FREETYPE),yes) |
255 SRCS_MENCODER += libvo/font_load_ft.c | 256 SRCS_MENCODER += libvo/font_load_ft.c |