Mercurial > mplayer.hg

comparison Makefile @ 19348:c4104abaaf46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Rename some variables for consistency.
author diego
date Mon, 07 Aug 2006 08:57:43 +0000
parents e5854db8a39f
children 317f91100cb1
comparison
equal deleted inserted replaced
19347:b176b5b7ff7c 19348:c4104abaaf46
160 PARTS += liba52 160 PARTS += liba52
161 endif 161 endif
162 ifeq ($(LIBMPEG2),yes) 162 ifeq ($(LIBMPEG2),yes)
163 PARTS += libmpeg2 163 PARTS += libmpeg2
164 endif 164 endif
165 ifeq ($(INTERNAL_FAAD),yes) 165 ifeq ($(FAAD_INTERNAL),yes)
166 COMMON_LIBS += libfaad2/libfaad2.a 166 COMMON_LIBS += libfaad2/libfaad2.a
167 PARTS += libfaad2 167 PARTS += libfaad2
168 endif 168 endif
169 ifeq ($(VIDIX),yes) 169 ifeq ($(VIDIX),yes)
170 PARTS += libdha vidix 170 PARTS += libdha vidix
216 endif 216 endif
217 ifeq ($(LIBMPEG2),yes) 217 ifeq ($(LIBMPEG2),yes)
218 COMMON_DEPS += libmpeg2/libmpeg2.a 218 COMMON_DEPS += libmpeg2/libmpeg2.a
219 COMMON_LIBS += libmpeg2/libmpeg2.a 219 COMMON_LIBS += libmpeg2/libmpeg2.a
220 endif 220 endif
221 ifeq ($(INTERNAL_FAAD),yes) 221 ifeq ($(FAAD_INTERNAL),yes)
222 COMMON_DEPS += libfaad2/libfaad2.a 222 COMMON_DEPS += libfaad2/libfaad2.a
223 endif 223 endif
224 ifeq ($(TREMOR),yes) 224 ifeq ($(TREMOR),yes)
225 COMMON_DEPS += tremor/libvorbisidec.a 225 COMMON_DEPS += tremor/libvorbisidec.a
226 COMMON_LIBS += tremor/libvorbisidec.a 226 COMMON_LIBS += tremor/libvorbisidec.a