Mercurial > mplayer.hg

comparison Makefile @ 32834:4224bc9b72ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust build system to reflect merge of libavcore into libavutil in FFmpeg. patch by Johan Andersson, j i19 se
author diego
date Thu, 17 Feb 2011 11:15:19 +0000
parents 2b0b38bfda8d
children fa04e96e6177
comparison
equal deleted inserted replaced
32833:c4891d10ddbb 32834:4224bc9b72ca
680 $(SRCS_MENCODER-yes) 680 $(SRCS_MENCODER-yes)
681 681
682 682
683 COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \ 683 COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \
684 ffmpeg/libavcodec/libavcodec.a \ 684 ffmpeg/libavcodec/libavcodec.a \
685 ffmpeg/libavcore/libavcore.a \
686 ffmpeg/libavutil/libavutil.a \ 685 ffmpeg/libavutil/libavutil.a \
687 ffmpeg/libpostproc/libpostproc.a \ 686 ffmpeg/libpostproc/libpostproc.a \
688 ffmpeg/libswscale/libswscale.a 687 ffmpeg/libswscale/libswscale.a
689 COMMON_LIBS += $(COMMON_LIBS-yes) 688 COMMON_LIBS += $(COMMON_LIBS-yes)
690 689
714 ffmpeg/libavcodec/mlib \ 713 ffmpeg/libavcodec/mlib \
715 ffmpeg/libavcodec/ppc \ 714 ffmpeg/libavcodec/ppc \
716 ffmpeg/libavcodec/sh4 \ 715 ffmpeg/libavcodec/sh4 \
717 ffmpeg/libavcodec/sparc \ 716 ffmpeg/libavcodec/sparc \
718 ffmpeg/libavcodec/x86 \ 717 ffmpeg/libavcodec/x86 \
719 ffmpeg/libavcore \
720 ffmpeg/libavformat \ 718 ffmpeg/libavformat \
721 ffmpeg/libavutil \ 719 ffmpeg/libavutil \
722 ffmpeg/libavutil/arm \ 720 ffmpeg/libavutil/arm \
723 ffmpeg/libavutil/bfin \ 721 ffmpeg/libavutil/bfin \
724 ffmpeg/libavutil/ppc \ 722 ffmpeg/libavutil/ppc \
772 ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2))) 770 ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
773 ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS)) 771 ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS))
774 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1)) 772 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
775 773
776 FFMPEGPARTS = libavcodec \ 774 FFMPEGPARTS = libavcodec \
777 libavcore \
778 libavformat \ 775 libavformat \
779 libavutil \ 776 libavutil \
780 libpostproc \ 777 libpostproc \
781 libswscale \ 778 libswscale \
782 779