Mercurial > mplayer.hg

comparison Makefile @ 34567:2c9db9cb7310

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix lavfi dependencies (swscale and swresample).
author cigaes
date Tue, 07 Feb 2012 12:27:23 +0000
parents 6c6fb701fa8e
children 4e7cc799cf54
comparison
equal deleted inserted replaced
34566:f3d53cd55376 34567:2c9db9cb7310
687 libmpdemux/muxer_rawaudio.c \ 687 libmpdemux/muxer_rawaudio.c \
688 libmpdemux/muxer_rawvideo.c \ 688 libmpdemux/muxer_rawvideo.c \
689 $(SRCS_MENCODER-yes) 689 $(SRCS_MENCODER-yes)
690 690
691 # (linking) order matters for these libraries 691 # (linking) order matters for these libraries
692 FFMPEGPARTS = libpostproc libswscale libavfilter libavformat libavcodec libavutil 692 FFMPEGPARTS_ALL = libpostproc libavfilter libavformat libavcodec libswscale libswresample libavutil
693 FFMPEGPARTS = $(foreach part, $(FFMPEGPARTS_ALL), $(if $(wildcard ffmpeg/$(part)), $(part)))
693 FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a) 694 FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a)
694 FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(addprefix ffmpeg/$(part)/,*.[chS] /*/*.[chS] /*/*.asm))) 695 FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(addprefix ffmpeg/$(part)/,*.[chS] /*/*.[chS] /*/*.asm)))
695 696
696 COMMON_LIBS-$(FFMPEG_A) += $(FFMPEGLIBS) 697 COMMON_LIBS-$(FFMPEG_A) += $(FFMPEGLIBS)
697 COMMON_LIBS += $(COMMON_LIBS-yes) 698 COMMON_LIBS += $(COMMON_LIBS-yes)