comparison Makefile @ 31090:1aece15222b5

Remove internal liba52 copy. Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.
author diego
date Sun, 09 May 2010 14:45:29 +0000
parents 362425fe3de8
children 5ad926edeccc
comparison
equal deleted inserted replaced
31089:459227551819 31090:1aece15222b5
106 SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c 106 SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
107 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c 107 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
108 SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c 108 SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
109 SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c 109 SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
110 SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c 110 SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
111 SRCS_LIBA52_INTERNAL += liba52/crc.c \
112 liba52/resample.c \
113 liba52/bit_allocate.c \
114 liba52/bitstream.c \
115 liba52/downmix.c \
116 liba52/imdct.c \
117 liba52/parse.c \
118
119 SRCS_COMMON-$(LIBA52_INTERNAL) += $(SRCS_LIBA52_INTERNAL)
120
121 SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \ 111 SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
122 libass/ass_mp.c \ 112 libass/ass_mp.c \
123 113
124 SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \ 114 SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \
125 libass/ass_bitmap.c \ 115 libass/ass_bitmap.c \
756 gui/mplayer/gtk \ 746 gui/mplayer/gtk \
757 gui/skin \ 747 gui/skin \
758 gui/wm \ 748 gui/wm \
759 gui/win32 \ 749 gui/win32 \
760 input \ 750 input \
761 liba52 \
762 libaf \ 751 libaf \
763 libao2 \ 752 libao2 \
764 libass \ 753 libass \
765 libavcodec \ 754 libavcodec \
766 libavcodec/alpha \ 755 libavcodec/alpha \
1018 $(CC) -I. -DTESTING -o $@ $^ 1007 $(CC) -I. -DTESTING -o $@ $^
1019 1008
1020 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) 1009 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
1021 $(CC) -I. -DCODECS2HTML -o $@ $^ 1010 $(CC) -I. -DCODECS2HTML -o $@ $^
1022 1011
1023 liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
1024
1025 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) 1012 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
1026 1013
1027 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS) 1014 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
1028 1015
1029 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g 1016 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
1030 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) 1017 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
1031 1018
1032 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) 1019 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
1033 1020
1034 TESTS = codecs2html codec-cfg-test liba52/test libvo/aspecttest \ 1021 TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
1035 mp3lib/test mp3lib/test2
1036 1022
1037 ifdef ARCH_X86 1023 ifdef ARCH_X86
1038 TESTS += loader/qtx/list loader/qtx/qtxload 1024 TESTS += loader/qtx/list loader/qtx/qtxload
1039 endif 1025 endif
1040 1026