From d5f4f0856c5c012c005880bfc5cd252780f32a47 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 14:53:41 +0000 Subject: Add files in all library subdirectories to FFMPEGFILES variable, not just the ones below libavcodec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29191 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2eeace4ebd..d6097d5bb8 100644 --- a/Makefile +++ b/Makefile @@ -792,7 +792,7 @@ PARTS = libavcodec \ libswscale \ FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS]) +FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] $(part)/*/*.[chS]) -- cgit v1.2.3 From 3f123a96644a9a81f695b00b42e8a81c01be9ba0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 14:54:44 +0000 Subject: Remove duplicate entry from DIRS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29192 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d6097d5bb8..2ffdb8b514 100644 --- a/Makefile +++ b/Makefile @@ -748,7 +748,6 @@ DIRS = . \ libavutil \ libavutil/arm \ libavutil/bfin \ - libavutil/bfin \ libavutil/ppc \ libavutil/sh4 \ libavutil/x86 \ -- cgit v1.2.3 From cc0798973858ffff30b1a314b2ddf0733fbbcf92 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 15:16:04 +0000 Subject: Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29193 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2ffdb8b514..544760b32b 100644 --- a/Makefile +++ b/Makefile @@ -953,18 +953,18 @@ uninstall: rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) -ADD_ALL_EXESUFS = $(foreach exesuf,$(EXESUFS_ALL),$(1) $(1)$(exesuf)) +ADD_ALL_EXESUFS = $(foreach file,$(1),$(foreach exesuf,$(EXESUFS_ALL),$(file) $(file)$(exesuf))) clean: -rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) - -rm -f $(foreach file,mplayer mencoder,$(call ADD_ALL_EXESUFS,$(file))) + -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) 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 \ version.h $(VIDIX_PCI_FILES) TAGS tags - -rm -f $(foreach file,codec-cfg cpuinfo,$(call ADD_ALL_EXESUFS,$(file))) + -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) doxygen: doxygen DOCS/tech/Doxyfile @@ -1008,7 +1008,7 @@ endif tests: $(addsuffix $(EXESUF),$(TESTS)) testsclean: - -rm -f $(foreach file,$(TESTS),$(call ADD_ALL_EXESUFS,$(file))) + -rm -f $(call ADD_ALL_EXESUFS,$(TESTS)) TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump) -- cgit v1.2.3 From dc161a651e146ee763b303e4effac3addb9a67a2 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 15:22:27 +0000 Subject: Convert another forgotten ADD_ALL_EXESUFS call. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29194 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 544760b32b..9639d8fecc 100644 --- a/Makefile +++ b/Makefile @@ -1022,7 +1022,7 @@ tools: $(addsuffix $(EXESUF),$(TOOLS)) alltools: $(addsuffix $(EXESUF),$(ALLTOOLS)) toolsclean: - -rm -f $(foreach file,$(ALLTOOLS),$(call ADD_ALL_EXESUFS,$(file))) + -rm -f $(call ADD_ALL_EXESUFS,$(ALLTOOLS)) -rm -f TOOLS/realcodecs/*.so.6.0 TOOLS/bmovl-test$(EXESUF): -lSDL_image -- cgit v1.2.3 From bf2a47d8717adb2306d1538e7d1f57ea1543e4a9 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 15:51:06 +0000 Subject: Introduce ADD_ALL_DIRS function to factorize clean and distclean target commands to remove certain patterns in all subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29195 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9639d8fecc..708de3f10c 100644 --- a/Makefile +++ b/Makefile @@ -953,15 +953,16 @@ uninstall: rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) +ADD_ALL_DIRS = $(foreach dir,$(DIRS),$(foreach suffix,$(1),$(addsuffix $(suffix),$(dir)))) ADD_ALL_EXESUFS = $(foreach file,$(1),$(foreach exesuf,$(EXESUFS_ALL),$(file) $(file)$(exesuf))) clean: - -rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) + -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) 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 $(call ADD_ALL_DIRS,/*.d) -rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) TAGS tags -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) -- cgit v1.2.3 From a16fc43c34a1a3710b8b6b844a0826f0258d8046 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 15:54:16 +0000 Subject: cosmetics: Rename PARTS variable to FFMPEGPARTS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29196 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 708de3f10c..7d04570394 100644 --- a/Makefile +++ b/Makefile @@ -784,14 +784,14 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -PARTS = libavcodec \ +FFMPEGPARTS = libavcodec \ libavformat \ libavutil \ libpostproc \ libswscale \ -FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] $(part)/*/*.[chS]) +FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) +FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(part)/*.[chS] $(part)/*/*.[chS]) @@ -820,7 +820,7 @@ all: $(ALL_PRG-yes) checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) - for part in $(PARTS); do $(MAKE) -C $$part depend; done + for part in $(FFMPEGPARTS); do $(MAKE) -C $$part depend; done $(FFMPEGLIBS): $(FFMPEGFILES) config.h $(MAKE) -C $(@D) -- cgit v1.2.3 From 2bed79b908119e6b9ca8b6acb3db935d928017a6 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Apr 2009 15:54:48 +0000 Subject: whitespace cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29197 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7d04570394..3b5e12f525 100644 --- a/Makefile +++ b/Makefile @@ -390,7 +390,7 @@ SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c mp3lib/dct64_3dnow.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ mp3lib/dct64_k7.c -SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c +SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE) += mp3lib/dct64_sse.c @@ -785,10 +785,10 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) FFMPEGPARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ - libswscale \ + libavformat \ + libavutil \ + libpostproc \ + libswscale \ FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(part)/*.[chS] $(part)/*/*.[chS]) -- cgit v1.2.3 From 8f0639d4cccfab5d88e79d8a7d5bc77924dc8c36 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 00:16:53 +0000 Subject: cosmetics: Move ADD_ALL_* functions to a more sensible place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29201 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3b5e12f525..7037fb1a7f 100644 --- a/Makefile +++ b/Makefile @@ -784,6 +784,9 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) +ADD_ALL_DIRS = $(foreach dir,$(DIRS),$(foreach suffix,$(1),$(addsuffix $(suffix),$(dir)))) +ADD_ALL_EXESUFS = $(foreach file,$(1),$(foreach exesuf,$(EXESUFS_ALL),$(file) $(file)$(exesuf))) + FFMPEGPARTS = libavcodec \ libavformat \ libavutil \ @@ -953,9 +956,6 @@ uninstall: rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) -ADD_ALL_DIRS = $(foreach dir,$(DIRS),$(foreach suffix,$(1),$(addsuffix $(suffix),$(dir)))) -ADD_ALL_EXESUFS = $(foreach file,$(1),$(foreach exesuf,$(EXESUFS_ALL),$(file) $(file)$(exesuf))) - clean: -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) -- cgit v1.2.3 From 1ec5ec1fa1d62c52e76691835490cf19ac41ac41 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 00:18:59 +0000 Subject: Introduce ADDSUFFIXES function and use it to simplify the ADD_ALL_DIRS and ADD_ALL_EXESUFS functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29202 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7037fb1a7f..4037606474 100644 --- a/Makefile +++ b/Makefile @@ -784,8 +784,9 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -ADD_ALL_DIRS = $(foreach dir,$(DIRS),$(foreach suffix,$(1),$(addsuffix $(suffix),$(dir)))) -ADD_ALL_EXESUFS = $(foreach file,$(1),$(foreach exesuf,$(EXESUFS_ALL),$(file) $(file)$(exesuf))) +ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2))) +ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS)) +ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1)) FFMPEGPARTS = libavcodec \ libavformat \ -- cgit v1.2.3 From 2ff2081e06153508b525f05009b23fa13750e627 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 00:19:39 +0000 Subject: Use ADDSUFFIXES function to simplify version.h dependency declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29203 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4037606474..b0bae1c54d 100644 --- a/Makefile +++ b/Makefile @@ -867,7 +867,7 @@ version.h: version.sh # Make sure all generated header files are created. codec-cfg.d codec-cfg.o: codecs.conf.h $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h -mpcommon.d mpcommon.o vobsub.d vobsub.o stream/stream_cddb.d stream/stream_cddb.o stream/network.d stream/network.o libmpdemux/muxer_avi.d libmpdemux/muxer_avi.o gui/win32/gui.d gui/win32/gui.o: version.h +$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" -- cgit v1.2.3 From a12ecf35b2ca7856b4d5fcc284d5fb10a2011072 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 03:39:44 +0000 Subject: =?UTF-8?q?Only=20add=20existing=20files=20to=20the=20FFMPEGFILES?= =?UTF-8?q?=20variable.=20based=20on=20a=20patch=20by=20Carl=20F=C3=BCrste?= =?UTF-8?q?nberg,=20azatoth=20gmail=20com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29204 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b0bae1c54d..686aef434b 100644 --- a/Makefile +++ b/Makefile @@ -795,7 +795,7 @@ FFMPEGPARTS = libavcodec \ libswscale \ FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(part)/*.[chS] $(part)/*/*.[chS]) +FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) -- cgit v1.2.3 From 40ea07ea421f391c7a4f3a94043970a57288537c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 13:51:47 +0000 Subject: Use temporary variables to add objects that depend on more than one condition to conditionally compiled parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29206 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 686aef434b..d7271d4ef6 100644 --- a/Makefile +++ b/Makefile @@ -221,9 +221,10 @@ SRCS_COMMON = asxparser.c \ stream/stream_null.c \ stream/url.c \ -SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9) += stream/ai_alsa.c -SRCS_COMMON-$(AUDIO_INPUT)-$(OSS) += stream/ai_oss.c +SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c +SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c +SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c +SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ stream/cdinfo.c @@ -353,6 +354,16 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/libdvdcss.c \ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c + +SRCS_LIBMPEG2-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \ + libmpeg2/motion_comp_alpha.c +SRCS_LIBMPEG2-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \ + libmpeg2/motion_comp_arm_s.S +SRCS_LIBMPEG2-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \ + libmpeg2/motion_comp_altivec.c +SRCS_LIBMPEG2-$(HAVE_MMX) += libmpeg2/idct_mmx.c \ + libmpeg2/motion_comp_mmx.c +SRCS_LIBMPEG2-$(HAVE_VIS) += libmpeg2/motion_comp_vis.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ libmpeg2/alloc.c \ libmpeg2/cpu_accel.c\ @@ -361,16 +372,8 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ libmpeg2/header.c \ libmpeg2/idct.c \ libmpeg2/motion_comp.c \ - libmpeg2/slice.c -SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \ - libmpeg2/motion_comp_alpha.c -SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \ - libmpeg2/motion_comp_arm_s.S -SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \ - libmpeg2/motion_comp_altivec.c -SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX) += libmpeg2/idct_mmx.c \ - libmpeg2/motion_comp_mmx.c -SRCS_COMMON-$(LIBMPEG2)-$(HAVE_VIS) += libmpeg2/motion_comp_vis.c + libmpeg2/slice.c \ + $(SRCS_LIBMPEG2-yes) SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c @@ -384,16 +387,18 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ stream/stream_live555.c SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c -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_AMD3DNOW) += mp3lib/dct36_3dnow.c \ - mp3lib/dct64_3dnow.c -SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOWEXT) += 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 -SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c -SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE) += mp3lib/dct64_sse.c +SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ + mp3lib/dct64_3dnow.c +SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ + mp3lib/dct64_k7.c +SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c +SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \ + $(SRCS_MP3LIB-X86-yes) +SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c +SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c +SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c +SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c \ + $(SRCS_MP3LIB-yes) SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ libmpdemux/demux_mpc.c SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ @@ -695,7 +700,7 @@ SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c -SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes) +SRCS_COMMON += $(SRCS_COMMON-yes) SRCS_MENCODER += $(SRCS_MENCODER-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) -- cgit v1.2.3 From 7e7abb386b236b56a8cc6d404d312097ff057844 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 13:52:14 +0000 Subject: whitespace cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29207 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d7271d4ef6..d10d04199a 100644 --- a/Makefile +++ b/Makefile @@ -374,6 +374,7 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ libmpeg2/motion_comp.c \ libmpeg2/slice.c \ $(SRCS_LIBMPEG2-yes) + SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c @@ -387,6 +388,7 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ stream/stream_live555.c SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c + SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ mp3lib/dct64_3dnow.c SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ @@ -399,6 +401,7 @@ SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c \ $(SRCS_MP3LIB-yes) + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ libmpdemux/demux_mpc.c SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ -- cgit v1.2.3 From 30c70cab76d3fb4135609daf976feb8fe9e8f918 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Apr 2009 14:02:40 +0000 Subject: Move non-conditional SRCS lists below the conditional parts. This allows simplifying the addition of the conditional parts to the SRCS lists. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29208 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 445 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 223 insertions(+), 222 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d10d04199a..662d7807a0 100644 --- a/Makefile +++ b/Makefile @@ -33,194 +33,6 @@ LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \ LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ $(COMMON_LDFLAGS) \ -SRCS_COMMON = asxparser.c \ - codec-cfg.c \ - cpudetect.c \ - edl.c \ - find_sub.c \ - fmt-conversion.c \ - get_path.c \ - m_config.c \ - m_option.c \ - m_struct.c \ - mpcommon.c \ - parser-cfg.c \ - playtree.c \ - playtreeparser.c \ - spudec.c \ - sub_cc.c \ - subopt-helper.c \ - subreader.c \ - vobsub.c \ - libaf/af.c \ - libaf/af_center.c \ - libaf/af_channels.c \ - libaf/af_comp.c \ - libaf/af_delay.c \ - libaf/af_dummy.c \ - libaf/af_equalizer.c \ - libaf/af_extrastereo.c \ - libaf/af_format.c \ - libaf/af_gate.c \ - libaf/af_hrtf.c \ - libaf/af_karaoke.c \ - libaf/af_pan.c \ - libaf/af_resample.c \ - libaf/af_scaletempo.c \ - libaf/af_sinesuppress.c \ - libaf/af_stats.c \ - libaf/af_sub.c \ - libaf/af_surround.c \ - libaf/af_sweep.c \ - libaf/af_tools.c \ - libaf/af_volnorm.c \ - libaf/af_volume.c \ - libaf/filter.c \ - libaf/format.c \ - libaf/reorder_ch.c \ - libaf/window.c \ - libmpcodecs/ad.c \ - libmpcodecs/ad_alaw.c \ - libmpcodecs/ad_dk3adpcm.c \ - libmpcodecs/ad_dvdpcm.c \ - libmpcodecs/ad_hwmpa.c \ - libmpcodecs/ad_imaadpcm.c \ - libmpcodecs/ad_msadpcm.c \ - libmpcodecs/ad_msgsm.c \ - libmpcodecs/ad_pcm.c \ - libmpcodecs/dec_audio.c \ - libmpcodecs/dec_video.c \ - libmpcodecs/img_format.c \ - libmpcodecs/mp_image.c \ - libmpcodecs/native/xa_gsm.c \ - libmpcodecs/pullup.c \ - libmpcodecs/vd.c \ - libmpcodecs/vd_hmblck.c \ - libmpcodecs/vd_lzo.c \ - libmpcodecs/vd_mpegpes.c \ - libmpcodecs/vd_mtga.c \ - libmpcodecs/vd_null.c \ - libmpcodecs/vd_raw.c \ - libmpcodecs/vd_sgi.c \ - libmpcodecs/vf.c \ - libmpcodecs/vf_1bpp.c \ - libmpcodecs/vf_2xsai.c \ - libmpcodecs/vf_blackframe.c \ - libmpcodecs/vf_boxblur.c \ - libmpcodecs/vf_crop.c \ - libmpcodecs/vf_cropdetect.c \ - libmpcodecs/vf_decimate.c \ - libmpcodecs/vf_delogo.c \ - libmpcodecs/vf_denoise3d.c \ - libmpcodecs/vf_detc.c \ - libmpcodecs/vf_dint.c \ - libmpcodecs/vf_divtc.c \ - libmpcodecs/vf_down3dright.c \ - libmpcodecs/vf_dsize.c \ - libmpcodecs/vf_dvbscale.c \ - libmpcodecs/vf_eq.c \ - libmpcodecs/vf_eq2.c \ - libmpcodecs/vf_expand.c \ - libmpcodecs/vf_field.c \ - libmpcodecs/vf_fil.c \ - libmpcodecs/vf_filmdint.c \ - libmpcodecs/vf_flip.c \ - libmpcodecs/vf_format.c \ - libmpcodecs/vf_framestep.c \ - libmpcodecs/vf_halfpack.c \ - libmpcodecs/vf_harddup.c \ - libmpcodecs/vf_hqdn3d.c \ - libmpcodecs/vf_hue.c \ - libmpcodecs/vf_il.c \ - libmpcodecs/vf_ilpack.c \ - libmpcodecs/vf_ivtc.c \ - libmpcodecs/vf_kerndeint.c \ - libmpcodecs/vf_mirror.c \ - libmpcodecs/vf_noformat.c \ - libmpcodecs/vf_noise.c \ - libmpcodecs/vf_ow.c \ - libmpcodecs/vf_palette.c \ - libmpcodecs/vf_perspective.c \ - libmpcodecs/vf_phase.c \ - libmpcodecs/vf_pp7.c \ - libmpcodecs/vf_pullup.c \ - libmpcodecs/vf_rectangle.c \ - libmpcodecs/vf_remove_logo.c \ - libmpcodecs/vf_rgb2bgr.c \ - libmpcodecs/vf_rgbtest.c \ - libmpcodecs/vf_rotate.c \ - libmpcodecs/vf_sab.c \ - libmpcodecs/vf_scale.c \ - libmpcodecs/vf_smartblur.c \ - libmpcodecs/vf_softpulldown.c \ - libmpcodecs/vf_softskip.c \ - libmpcodecs/vf_swapuv.c \ - libmpcodecs/vf_telecine.c \ - libmpcodecs/vf_test.c \ - libmpcodecs/vf_tfields.c \ - libmpcodecs/vf_tile.c \ - libmpcodecs/vf_tinterlace.c \ - libmpcodecs/vf_unsharp.c \ - libmpcodecs/vf_vo.c \ - libmpcodecs/vf_yadif.c \ - libmpcodecs/vf_yuvcsp.c \ - libmpcodecs/vf_yuy2.c \ - libmpcodecs/vf_yvu9.c \ - libmpdemux/aac_hdr.c \ - libmpdemux/asfheader.c \ - libmpdemux/aviheader.c \ - libmpdemux/aviprint.c \ - libmpdemux/demuxer.c \ - libmpdemux/demux_aac.c \ - libmpdemux/demux_asf.c \ - libmpdemux/demux_audio.c \ - libmpdemux/demux_avi.c \ - libmpdemux/demux_demuxers.c \ - libmpdemux/demux_film.c \ - libmpdemux/demux_fli.c \ - libmpdemux/demux_lmlm4.c \ - libmpdemux/demux_mf.c \ - libmpdemux/demux_mkv.c \ - libmpdemux/demux_mov.c \ - libmpdemux/demux_mpg.c \ - libmpdemux/demux_nsv.c \ - libmpdemux/demux_pva.c \ - libmpdemux/demux_rawaudio.c \ - libmpdemux/demux_rawvideo.c \ - libmpdemux/demux_realaud.c \ - libmpdemux/demux_real.c \ - libmpdemux/demux_roq.c \ - libmpdemux/demux_smjpeg.c \ - libmpdemux/demux_ts.c \ - libmpdemux/demux_ty.c \ - libmpdemux/demux_ty_osd.c \ - libmpdemux/demux_viv.c \ - libmpdemux/demux_vqf.c \ - libmpdemux/demux_y4m.c \ - libmpdemux/ebml.c \ - libmpdemux/extension.c \ - libmpdemux/mf.c \ - libmpdemux/mp3_hdr.c \ - libmpdemux/mp_taglists.c \ - libmpdemux/mpeg_hdr.c \ - libmpdemux/mpeg_packetizer.c \ - libmpdemux/parse_es.c \ - libmpdemux/parse_mp4.c \ - libmpdemux/video.c \ - libmpdemux/yuv4mpeg.c \ - libmpdemux/yuv4mpeg_ratio.c \ - libvo/osd.c \ - libvo/sub.c \ - osdep/$(GETCH) \ - osdep/$(TIMER) \ - stream/open.c \ - stream/stream.c \ - stream/stream_cue.c \ - stream/stream_file.c \ - stream/stream_mf.c \ - stream/stream_null.c \ - stream/url.c \ - SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c @@ -519,25 +331,195 @@ SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c +SRCS_COMMON = asxparser.c \ + codec-cfg.c \ + cpudetect.c \ + edl.c \ + find_sub.c \ + fmt-conversion.c \ + get_path.c \ + m_config.c \ + m_option.c \ + m_struct.c \ + mpcommon.c \ + parser-cfg.c \ + playtree.c \ + playtreeparser.c \ + spudec.c \ + sub_cc.c \ + subopt-helper.c \ + subreader.c \ + vobsub.c \ + libaf/af.c \ + libaf/af_center.c \ + libaf/af_channels.c \ + libaf/af_comp.c \ + libaf/af_delay.c \ + libaf/af_dummy.c \ + libaf/af_equalizer.c \ + libaf/af_extrastereo.c \ + libaf/af_format.c \ + libaf/af_gate.c \ + libaf/af_hrtf.c \ + libaf/af_karaoke.c \ + libaf/af_pan.c \ + libaf/af_resample.c \ + libaf/af_scaletempo.c \ + libaf/af_sinesuppress.c \ + libaf/af_stats.c \ + libaf/af_sub.c \ + libaf/af_surround.c \ + libaf/af_sweep.c \ + libaf/af_tools.c \ + libaf/af_volnorm.c \ + libaf/af_volume.c \ + libaf/filter.c \ + libaf/format.c \ + libaf/reorder_ch.c \ + libaf/window.c \ + libmpcodecs/ad.c \ + libmpcodecs/ad_alaw.c \ + libmpcodecs/ad_dk3adpcm.c \ + libmpcodecs/ad_dvdpcm.c \ + libmpcodecs/ad_hwmpa.c \ + libmpcodecs/ad_imaadpcm.c \ + libmpcodecs/ad_msadpcm.c \ + libmpcodecs/ad_msgsm.c \ + libmpcodecs/ad_pcm.c \ + libmpcodecs/dec_audio.c \ + libmpcodecs/dec_video.c \ + libmpcodecs/img_format.c \ + libmpcodecs/mp_image.c \ + libmpcodecs/native/xa_gsm.c \ + libmpcodecs/pullup.c \ + libmpcodecs/vd.c \ + libmpcodecs/vd_hmblck.c \ + libmpcodecs/vd_lzo.c \ + libmpcodecs/vd_mpegpes.c \ + libmpcodecs/vd_mtga.c \ + libmpcodecs/vd_null.c \ + libmpcodecs/vd_raw.c \ + libmpcodecs/vd_sgi.c \ + libmpcodecs/vf.c \ + libmpcodecs/vf_1bpp.c \ + libmpcodecs/vf_2xsai.c \ + libmpcodecs/vf_blackframe.c \ + libmpcodecs/vf_boxblur.c \ + libmpcodecs/vf_crop.c \ + libmpcodecs/vf_cropdetect.c \ + libmpcodecs/vf_decimate.c \ + libmpcodecs/vf_delogo.c \ + libmpcodecs/vf_denoise3d.c \ + libmpcodecs/vf_detc.c \ + libmpcodecs/vf_dint.c \ + libmpcodecs/vf_divtc.c \ + libmpcodecs/vf_down3dright.c \ + libmpcodecs/vf_dsize.c \ + libmpcodecs/vf_dvbscale.c \ + libmpcodecs/vf_eq.c \ + libmpcodecs/vf_eq2.c \ + libmpcodecs/vf_expand.c \ + libmpcodecs/vf_field.c \ + libmpcodecs/vf_fil.c \ + libmpcodecs/vf_filmdint.c \ + libmpcodecs/vf_flip.c \ + libmpcodecs/vf_format.c \ + libmpcodecs/vf_framestep.c \ + libmpcodecs/vf_halfpack.c \ + libmpcodecs/vf_harddup.c \ + libmpcodecs/vf_hqdn3d.c \ + libmpcodecs/vf_hue.c \ + libmpcodecs/vf_il.c \ + libmpcodecs/vf_ilpack.c \ + libmpcodecs/vf_ivtc.c \ + libmpcodecs/vf_kerndeint.c \ + libmpcodecs/vf_mirror.c \ + libmpcodecs/vf_noformat.c \ + libmpcodecs/vf_noise.c \ + libmpcodecs/vf_ow.c \ + libmpcodecs/vf_palette.c \ + libmpcodecs/vf_perspective.c \ + libmpcodecs/vf_phase.c \ + libmpcodecs/vf_pp7.c \ + libmpcodecs/vf_pullup.c \ + libmpcodecs/vf_rectangle.c \ + libmpcodecs/vf_remove_logo.c \ + libmpcodecs/vf_rgb2bgr.c \ + libmpcodecs/vf_rgbtest.c \ + libmpcodecs/vf_rotate.c \ + libmpcodecs/vf_sab.c \ + libmpcodecs/vf_scale.c \ + libmpcodecs/vf_smartblur.c \ + libmpcodecs/vf_softpulldown.c \ + libmpcodecs/vf_softskip.c \ + libmpcodecs/vf_swapuv.c \ + libmpcodecs/vf_telecine.c \ + libmpcodecs/vf_test.c \ + libmpcodecs/vf_tfields.c \ + libmpcodecs/vf_tile.c \ + libmpcodecs/vf_tinterlace.c \ + libmpcodecs/vf_unsharp.c \ + libmpcodecs/vf_vo.c \ + libmpcodecs/vf_yadif.c \ + libmpcodecs/vf_yuvcsp.c \ + libmpcodecs/vf_yuy2.c \ + libmpcodecs/vf_yvu9.c \ + libmpdemux/aac_hdr.c \ + libmpdemux/asfheader.c \ + libmpdemux/aviheader.c \ + libmpdemux/aviprint.c \ + libmpdemux/demuxer.c \ + libmpdemux/demux_aac.c \ + libmpdemux/demux_asf.c \ + libmpdemux/demux_audio.c \ + libmpdemux/demux_avi.c \ + libmpdemux/demux_demuxers.c \ + libmpdemux/demux_film.c \ + libmpdemux/demux_fli.c \ + libmpdemux/demux_lmlm4.c \ + libmpdemux/demux_mf.c \ + libmpdemux/demux_mkv.c \ + libmpdemux/demux_mov.c \ + libmpdemux/demux_mpg.c \ + libmpdemux/demux_nsv.c \ + libmpdemux/demux_pva.c \ + libmpdemux/demux_rawaudio.c \ + libmpdemux/demux_rawvideo.c \ + libmpdemux/demux_realaud.c \ + libmpdemux/demux_real.c \ + libmpdemux/demux_roq.c \ + libmpdemux/demux_smjpeg.c \ + libmpdemux/demux_ts.c \ + libmpdemux/demux_ty.c \ + libmpdemux/demux_ty_osd.c \ + libmpdemux/demux_viv.c \ + libmpdemux/demux_vqf.c \ + libmpdemux/demux_y4m.c \ + libmpdemux/ebml.c \ + libmpdemux/extension.c \ + libmpdemux/mf.c \ + libmpdemux/mp3_hdr.c \ + libmpdemux/mp_taglists.c \ + libmpdemux/mpeg_hdr.c \ + libmpdemux/mpeg_packetizer.c \ + libmpdemux/parse_es.c \ + libmpdemux/parse_mp4.c \ + libmpdemux/video.c \ + libmpdemux/yuv4mpeg.c \ + libmpdemux/yuv4mpeg_ratio.c \ + libvo/osd.c \ + libvo/sub.c \ + osdep/$(GETCH) \ + osdep/$(TIMER) \ + stream/open.c \ + stream/stream.c \ + stream/stream_cue.c \ + stream/stream_file.c \ + stream/stream_mf.c \ + stream/stream_null.c \ + stream/url.c \ + $(SRCS_COMMON-yes) -SRCS_MPLAYER = mplayer.c \ - m_property.c \ - mp_fifo.c \ - mp_msg.c \ - mixer.c \ - parser-mpcmd.c \ - command.c \ - input/input.c \ - libao2/audio_out.c \ - libao2/ao_mpegpes.c \ - libao2/ao_null.c \ - libao2/ao_pcm.c \ - libvo/aspect.c \ - libvo/geometry.c \ - libvo/spuenc.c \ - libvo/video_out.c \ - libvo/vo_mpegpes.c \ - libvo/vo_null.c \ SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c SRCS_MPLAYER-$(AA) += libvo/vo_aa.c @@ -676,19 +658,26 @@ SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c SRCS_MPLAYER-$(ZR) += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c -SRCS_MENCODER = mencoder.c \ - mp_msg-mencoder.c \ - parser-mecmd.c \ - xvid_vbr.c \ - libmpcodecs/ae.c \ - libmpcodecs/ae_pcm.c \ - libmpcodecs/ve.c \ - libmpcodecs/ve_raw.c \ - libmpdemux/muxer.c \ - libmpdemux/muxer_avi.c \ - libmpdemux/muxer_mpeg.c \ - libmpdemux/muxer_rawaudio.c \ - libmpdemux/muxer_rawvideo.c \ +SRCS_MPLAYER = mplayer.c \ + m_property.c \ + mp_fifo.c \ + mp_msg.c \ + mixer.c \ + parser-mpcmd.c \ + command.c \ + input/input.c \ + libao2/audio_out.c \ + libao2/ao_mpegpes.c \ + libao2/ao_null.c \ + libao2/ao_pcm.c \ + libvo/aspect.c \ + libvo/geometry.c \ + libvo/spuenc.c \ + libvo/video_out.c \ + libvo/vo_mpegpes.c \ + libvo/vo_null.c \ + $(SRCS_MPLAYER-yes) + SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c @@ -703,9 +692,21 @@ SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c -SRCS_COMMON += $(SRCS_COMMON-yes) -SRCS_MENCODER += $(SRCS_MENCODER-yes) -SRCS_MPLAYER += $(SRCS_MPLAYER-yes) +SRCS_MENCODER = mencoder.c \ + mp_msg-mencoder.c \ + parser-mecmd.c \ + xvid_vbr.c \ + libmpcodecs/ae.c \ + libmpcodecs/ae_pcm.c \ + libmpcodecs/ve.c \ + libmpcodecs/ve_raw.c \ + libmpdemux/muxer.c \ + libmpdemux/muxer_avi.c \ + libmpdemux/muxer_mpeg.c \ + libmpdemux/muxer_rawaudio.c \ + libmpdemux/muxer_rawvideo.c \ + $(SRCS_MENCODER-yes) + COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a -- cgit v1.2.3 From e3ec5b1fd377254e19685ddcce0988efda8bffbf Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 May 2009 14:53:47 +0000 Subject: Rename macosx audio output driver to coreaudio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 662d7807a0..c56aa88e86 100644 --- a/Makefile +++ b/Makefile @@ -531,7 +531,7 @@ SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c SRCS_MPLAYER-$(BL) += libvo/vo_bl.c SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c -SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_macosx.c +SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m SRCS_MPLAYER-$(DART) += libao2/ao_dart.c SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c -- cgit v1.2.3 From 27bc918ffeb095a2e932e373fa718fbb3a3f36c7 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 May 2009 16:55:05 +0000 Subject: Rename macosx video output driver to corevideo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c56aa88e86..7bd546fec1 100644 --- a/Makefile +++ b/Makefile @@ -532,7 +532,7 @@ SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c SRCS_MPLAYER-$(BL) += libvo/vo_bl.c SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c -SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m +SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m SRCS_MPLAYER-$(DART) += libao2/ao_dart.c SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c -- cgit v1.2.3