diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
| commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
| tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /Makefile | |
| parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
| parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
| download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz | |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -391,7 +391,7 @@ SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \ mp3lib/dct64_3dnow.c -SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += mp3lib/dct36_k7.c \ +SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEXT) += mp3lib/dct36_k7.c \ mp3lib/dct64_k7.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c @@ -852,7 +852,7 @@ version.h: ###### dependency declarations / specific CFLAGS ###### codec-cfg.o: codecs.conf.h -mencoder.o mplayer.o vobsub.o gui/win32/gui.o libmpdemux/muxer_avi.o osdep/mplayer-rc.o stream/network.o stream/stream_cddb.o: version.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) |