diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 49 |
1 files changed, 26 insertions, 23 deletions
@@ -36,6 +36,7 @@ LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ get_path.c \ @@ -50,6 +51,7 @@ SRCS_COMMON = asxparser.c \ sub_cc.c \ subopt-helper.c \ subreader.c \ + talloc.c \ vobsub.c \ libaf/af.c \ libaf/af_center.c \ @@ -515,6 +517,7 @@ SRCS_MPLAYER = mplayer.c \ $(addprefix libao2/,$(AO_SRCS)) \ libvo/aspect.c \ libvo/geometry.c \ + libvo/old_vo_wrapper.c \ libvo/spuenc.c \ libvo/video_out.c \ libvo/vo_mpegpes.c \ @@ -629,10 +632,10 @@ SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes SRCS_MENCODER += $(SRCS_MENCODER-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) -COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a -COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a -COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a -COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a +COMMON_LIBS-$(LIBAVFORMAT_A) += ffmpeg/libavformat/libavformat.a +COMMON_LIBS-$(LIBAVCODEC_A) += ffmpeg/libavcodec/libavcodec.a +COMMON_LIBS-$(LIBAVUTIL_A) += ffmpeg/libavutil/libavutil.a +COMMON_LIBS-$(LIBPOSTPROC_A) += ffmpeg/libpostproc/libpostproc.a COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) @@ -665,17 +668,17 @@ DIRS = . \ libaf \ libao2 \ libass \ - libavcodec \ - libavcodec/alpha \ - libavcodec/armv4l \ - libavcodec/bfin \ - libavcodec/i386 \ - libavcodec/mlib \ - libavcodec/ppc \ - libavcodec/sh4 \ - libavcodec/sparc \ - libavformat \ - libavutil \ + ffmpeg/libavcodec \ + ffmpeg/libavcodec/alpha \ + ffmpeg/libavcodec/armv4l \ + ffmpeg/libavcodec/bfin \ + ffmpeg/libavcodec/i386 \ + ffmpeg/libavcodec/mlib \ + ffmpeg/libavcodec/ppc \ + ffmpeg/libavcodec/sh4 \ + ffmpeg/libavcodec/sparc \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ libdvdcss \ libdvdread \ libfaad2 \ @@ -684,7 +687,7 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ - libpostproc \ + ffmpeg/libpostproc \ libswscale \ libvo \ loader \ @@ -702,14 +705,14 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -PARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ +PARTS = ffmpeg/libavcodec \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ + ffmpeg/libpostproc \ libswscale \ -FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS]) +FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(notdir $(part)).a) +FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] ffmpeg/libavcodec/*/*.[chS]) @@ -751,7 +754,7 @@ mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< + $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -Iffmpeg -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ |