Mercurial > mplayer.hg

comparison Makefile @ 35165:b924f0df5a1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove our internal mp3lib copy. We have FFmpeg as integrated decoder, and the external mpg123 library should include all important improvements from our mp3lib and is actually properly maintained.
author reimar
date Sun, 21 Oct 2012 12:10:38 +0000
parents 303bf4bab982
children a893e72567ca
comparison
equal deleted inserted replaced
35164:bc0898c7399b 35165:b924f0df5a1d
161 libmpdemux/demux_rtp_codec.cpp \ 161 libmpdemux/demux_rtp_codec.cpp \
162 stream/stream_live555.c 162 stream/stream_live555.c
163 SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c 163 SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
164 SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c 164 SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
165 SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c 165 SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
166
167 SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
168 mp3lib/dct64_3dnow.c
169 SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
170 mp3lib/dct64_k7.c
171 SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c
172 SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
173 $(SRCS_MP3LIB-X86-yes)
174 SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
175 SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
176 SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
177 SRCS_MP3LIB += mp3lib/sr1.c \
178 $(SRCS_MP3LIB-yes)
179 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \
180 $(SRCS_MP3LIB)
181 166
182 SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ 167 SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
183 libmpdemux/demux_mpc.c 168 libmpdemux/demux_mpc.c
184 SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ 169 SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
185 stream/freesdp/common.c \ 170 stream/freesdp/common.c \
1033 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) 1018 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS)
1034 1019
1035 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g 1020 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
1036 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) 1021 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
1037 1022
1038 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) 1023 TESTS = codecs2html codec-cfg-test libvo/aspecttest
1039
1040 TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
1041 1024
1042 ifdef ARCH_X86_32 1025 ifdef ARCH_X86_32
1043 TESTS += loader/qtx/list loader/qtx/qtxload 1026 TESTS += loader/qtx/list loader/qtx/qtxload
1044 endif 1027 endif
1045 1028