diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
| commit | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch) | |
| tree | 27b3fcc37410ea5f646eb5fc2411406f2cdee175 /Makefile | |
| parent | 259ea9d7034566760785fd5253f97b65ee8cd6ed (diff) | |
| parent | 7756839a147ce2421cfb4e3de046364962094b60 (diff) | |
| download | mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2 mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz | |
Merge svn changes up to r27649
Conflicts:
Makefile
configure
libvo/x11_common.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -296,8 +296,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_hwac3.c \ - libmpcodecs/ad_liba52.c \ - liba52/crc.c \ + libmpcodecs/ad_liba52.c +SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \ liba52/resample.c \ liba52/bit_allocate.c \ liba52/bitstream.c \ @@ -637,7 +637,7 @@ 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/libswscale.a +COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) @@ -755,7 +755,7 @@ mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -O -I. -Iffmpeg -DCODECS2HTML -o $@ $< + $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -Iffmpeg -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ |