diff options
| author |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
| commit | 1e869638280f962fb80f372d152234f21246c2af (patch) | |
| tree | 64657f88e7902aa000f44f40be4f8e575f58c8de /Makefile | |
| parent | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff) | |
| parent | 379b176f25905f273a368336c3f5f287eeea51a2 (diff) | |
Merge svn changes up to r28537
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -213,7 +213,6 @@ SRCS_COMMON = asxparser.c \ libmpdemux/video.c \ libmpdemux/yuv4mpeg.c \ libmpdemux/yuv4mpeg_ratio.c \ - libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ osdep/$(GETCH) \ @@ -299,6 +298,7 @@ SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ libfaad2/syntax.c \ libfaad2/tns.c \ +SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c @@ -435,6 +435,7 @@ SRCS_COMMON-$(NETWORK) += stream/stream_netstream.c \ stream/realrtsp/xbuffer.c \ SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c +SRCS_COMMON-$(PRIORITY) += osdep/priority.c SRCS_COMMON-$(PVR) += stream/stream_pvr.c SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ libmpcodecs/vd_qtvideo.c @@ -855,7 +856,7 @@ codec-cfg.o: codecs.conf.h mpcommon.o vobsub.o gui/win32/gui.o libmpdemux/muxer_avi.o osdep/mplayer-rc.o stream/network.o stream/stream_cddb.o: version.h $(DEPS): help_mp.h -libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS) +libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) @@ -941,7 +942,7 @@ clean: distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean rm -rf DOCS/tech/doxygen rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) - rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ + rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) \ codec-cfg$(EXESUF) cpuinfo$(EXESUF) TAGS tags |