From e362640899f2c88b6c05c5337850003826cbc878 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 09:16:15 +0000 Subject: Add rule for generating dependency files from Objective C files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mpcommon.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mpcommon.mak b/mpcommon.mak index 2cdcf7f266..afb17121f4 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -37,6 +37,9 @@ distclean:: clean %.d: %.cpp $(MPDEPEND_CMD_CXX) > $@ +%.d: %.m + $(MPDEPEND_CMD) > $@ + %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< -- cgit v1.2.3 From 6b593fd3633c5e2c77d9020041187701e173dd86 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 09:19:41 +0000 Subject: Take Objective C files into account when generating dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d2fd7d367..8b1670d387 100644 --- a/Makefile +++ b/Makefile @@ -606,7 +606,7 @@ DEPS = foo include mpcommon.mak -DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER))) +DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -- cgit v1.2.3 From 062a179f5f09e63dd204e58dc91cfc8e688ea326 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 09:27:58 +0000 Subject: Only add vidix to parts when VIDIX is enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b1670d387..b47cd674ac 100644 --- a/Makefile +++ b/Makefile @@ -564,8 +564,10 @@ PARTS = liba52 \ libpostproc \ libswscale \ mp3lib \ - vidix \ +ifeq ($(VIDIX),yes) +PARTS += vidix +endif ifeq ($(WIN32DLL),yes) PARTS += loader endif -- cgit v1.2.3 From be85def657c5316ce819a3a5c2577d69270d4de1 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 09:31:05 +0000 Subject: Add alltools target and variable to build non-linking tools. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b47cd674ac..409ac7b6c2 100644 --- a/Makefile +++ b/Makefile @@ -779,7 +779,14 @@ ifdef ARCH_X86 TOOLS += TOOLS/modify_reg$(EXESUF) endif +ALLTOOLS = $(TOOLS) \ + TOOLS/bmovl-test$(EXESUF) \ + TOOLS/vfw2menc$(EXESUF) \ + TOOLS/vivodump$(EXESUF) \ + TOOLS/netstream$(EXESUF) \ + tools: $(TOOLS) +alltools: $(ALLTOOLS) TOOLS_COMMON_LIBS = mp_msg.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ -ltermcap -lm @@ -825,8 +832,7 @@ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) $(CC) $(CFLAGS) -o $@ $^ toolsclean: - rm -f $(TOOLS) TOOLS/fastmem*-* TOOLS/netstream$(EXESUF) - rm -f TOOLS/bmovl-test$(EXESUF) TOOLS/vfw2menc$(EXESUF) $(REAL_TARGETS) + rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 -include $(DEPS) -- cgit v1.2.3 From 21c9bd3b8b9a7722e0067f05e884fc459dcadc91 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 10:53:32 +0000 Subject: Only compile libmpcodecs/ve_qtvideo.c on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- configure | 4 ++++ libmpcodecs/ve.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 409ac7b6c2..387c456a34 100644 --- a/Makefile +++ b/Makefile @@ -520,7 +520,7 @@ SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c -SRCS_MENCODER-$(QTX_CODECS) += libmpcodecs/ve_qtvideo.c +SRCS_MENCODER-$(QTX_CODECS_WIN32) += libmpcodecs/ve_qtvideo.c SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c diff --git a/configure b/configure index e456c83f3e..695de456d9 100755 --- a/configure +++ b/configure @@ -6316,11 +6316,13 @@ echores "$_real" echocheck "QuickTime codecs" _qtx_emulation=no +_def_qtx_win32='#undef USE_QTX_CODECS_WIN32' if test "$_qtx" = auto ; then test "$_win32dll" = yes || darwin && _qtx=yes fi if test "$_qtx" = yes ; then _def_qtx='#define USE_QTX_CODECS 1' + win32 && _qtx_codecs_win32=yes && _def_qtx_win32='#define USE_QTX_CODECS_WIN32 1' _codecmodules="qtx $_codecmodules" darwin || win32 || _qtx_emulation=yes else @@ -7789,6 +7791,7 @@ DVDNAV = $_dvdnav WIN32DLL = $_win32dll WIN32_EMULATION = $_win32_emulation QTX_CODECS = $_qtx +QTX_CODECS_WIN32 = $_qtx_codecs_win32 QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real XANIM_CODECS = $_xanim @@ -8568,6 +8571,7 @@ $_def_joystick /* enables / disables QTX codecs */ $_def_qtx +$_def_qtx_win32 /* enables / disables osd menu */ $_def_menu diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c index d74a0cd2d3..55c72332c2 100644 --- a/libmpcodecs/ve.c +++ b/libmpcodecs/ve.c @@ -28,7 +28,7 @@ static vf_info_t* encoder_list[]={ #endif #ifdef USE_WIN32DLL &ve_info_vfw, -#ifdef USE_QTX_CODECS +#ifdef USE_QTX_CODECS_WIN32 &ve_info_qtvideo, #endif #endif -- cgit v1.2.3 From 03bfbfb8ca41ad988b5e41c7e80436266a97b312 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 10:59:33 +0000 Subject: Mark alltools target as phony. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 387c456a34..933721571d 100644 --- a/Makefile +++ b/Makefile @@ -836,4 +836,4 @@ toolsclean: -include $(DEPS) -.PHONY: all doxygen *install* recurse strip tools +.PHONY: all doxygen *install* recurse strip *tools -- cgit v1.2.3 From dc7ffa9855bf884b6916fd65f16c37275d9a15e5 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 11:17:17 +0000 Subject: Merge clean and distclean rules. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/dhahelperwin/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vidix/dhahelperwin/Makefile b/vidix/dhahelperwin/Makefile index d6f8f94408..a35d5b66e5 100644 --- a/vidix/dhahelperwin/Makefile +++ b/vidix/dhahelperwin/Makefile @@ -33,9 +33,7 @@ dhahelper.sys: temp.exp dhahelper.o dhahelper-rc.o -lntoskrnl strip $@ -clean: +clean distclean: rm -f *.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp -distclean: clean - .PHONY: all clean distclean -- cgit v1.2.3 From 3f94c6185439438eff3207471faa1de9c8c06a0b Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 12:47:24 +0000 Subject: Merge vidix/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 39 ++++++++++++++++++++++++++++++++------- vidix/Makefile | 46 ---------------------------------------------- vidix/pci_db2c.awk | 10 +++++----- 3 files changed, 37 insertions(+), 58 deletions(-) delete mode 100644 vidix/Makefile diff --git a/Makefile b/Makefile index 933721571d..a5a65c5ebc 100644 --- a/Makefile +++ b/Makefile @@ -496,7 +496,28 @@ SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \ SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c SRCS_MPLAYER-$(LIRC) += input/lirc.c -SRCS_MPLAYER-$(VIDIX) += libvo/vosub_vidix.c +SRCS_MPLAYER-$(VIDIX) += libvo/vosub_vidix.c \ + vidix/vidixlib.c \ + vidix/drivers.c \ + vidix/dha.c \ + vidix/mtrr.c \ + vidix/pci.c \ + vidix/pci_names.c \ + vidix/pci_dev_ids.c\ + +SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += vidix/cyberblade_vid.c +SRCS_MPLAYER-$(VIDIX_IVTV) += vidix/ivtv_vid.c +SRCS_MPLAYER-$(VIDIX_MACH64) += vidix/mach64_vid.c +SRCS_MPLAYER-$(VIDIX_MGA) += vidix/mga_vid.c +SRCS_MPLAYER-$(VIDIX_MGA_CRTC2) += vidix/mga_crtc2_vid.c +SRCS_MPLAYER-$(VIDIX_NVIDIA) += vidix/nvidia_vid.c +SRCS_MPLAYER-$(VIDIX_PM2) += vidix/pm2_vid.c +SRCS_MPLAYER-$(VIDIX_PM3) += vidix/pm3_vid.c +SRCS_MPLAYER-$(VIDIX_RADEON) += vidix/radeon_vid.c +SRCS_MPLAYER-$(VIDIX_RAGE128) += vidix/rage128_vid.c +SRCS_MPLAYER-$(VIDIX_S3) += vidix/s3_vid.c +SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c +SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o @@ -538,8 +559,6 @@ COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a -LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a - ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -565,9 +584,6 @@ PARTS = liba52 \ libswscale \ mp3lib \ -ifeq ($(VIDIX),yes) -PARTS += vidix -endif ifeq ($(WIN32DLL),yes) PARTS += loader endif @@ -597,6 +613,7 @@ DIRS = dvdread \ stream/realrtsp \ tremor \ TOOLS \ + vidix \ all: recurse $(ALL_PRG) @@ -654,6 +671,14 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec +VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ + vidix/pci_names.h vidix/pci_vendors.h + +$(VIDIX_PCI_FILES): vidix/pci.db + LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) + +vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) + install: install-dirs $(INSTALL_TARGETS) install-dirs: @@ -713,7 +738,7 @@ uninstall: clean:: toolsclean -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ - codecs.conf.h help_mp.h version.h TAGS tags + codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) for part in $(PARTS); do $(MAKE) -C $$part clean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) diff --git a/vidix/Makefile b/vidix/Makefile deleted file mode 100644 index 6eeb66a444..0000000000 --- a/vidix/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -include ../config.mak - -LIBNAME_MPLAYER = vidix.a - -SRCS_MPLAYER = vidixlib.c \ - drivers.c \ - dha.c \ - mtrr.c \ - pci.c \ - pci_names.c \ - pci_dev_ids.c\ - -SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += cyberblade_vid.c -SRCS_MPLAYER-$(VIDIX_IVTV) += ivtv_vid.c -SRCS_MPLAYER-$(VIDIX_MACH64) += mach64_vid.c -SRCS_MPLAYER-$(VIDIX_MGA) += mga_vid.c -SRCS_MPLAYER-$(VIDIX_MGA_CRTC2) += mga_crtc2_vid.c -SRCS_MPLAYER-$(VIDIX_NVIDIA) += nvidia_vid.c -SRCS_MPLAYER-$(VIDIX_PM2) += pm2_vid.c -SRCS_MPLAYER-$(VIDIX_PM3) += pm3_vid.c -SRCS_MPLAYER-$(VIDIX_RADEON) += radeon_vid.c -SRCS_MPLAYER-$(VIDIX_RAGE128) += rage128_vid.c -SRCS_MPLAYER-$(VIDIX_S3) += s3_vid.c -SRCS_MPLAYER-$(VIDIX_SIS) += sis_vid.c sis_bridge.c -SRCS_MPLAYER-$(VIDIX_UNICHROME) += unichrome_vid.c - -# If you want libdha to use svgalib_helper for hardware access, -# uncomment this statement, and change the -I to the correct directory -# that includes svgalib_helper.o: -#CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/ - -PCI_FILES = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h - -libs: $(PCI_FILES) - -.depend: $(PCI_FILES) - -include ../mpcommon.mak - -$(OBJS_MPLAYER): $(PCI_FILES) - -$(PCI_FILES): pci.db - LC_ALL=C awk -f pci_db2c.awk $< $(VIDIX_PCIDB) - -clean:: - rm -f $(PCI_FILES) diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index 38bfca1407..eecdb31714 100644 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -33,11 +33,11 @@ BEGIN { } in_file = ARGV[1]; with_pci_db = ARGV[2]; - vendor_file = "pci_vendors.h"; - ids_file = "pci_ids.h" - name_file = "pci_names.c" - name_h_file = "pci_names.h" - dev_ids_file = "pci_dev_ids.c" + vendor_file = "vidix/pci_vendors.h"; + ids_file = "vidix/pci_ids.h" + name_file = "vidix/pci_names.c" + name_h_file = "vidix/pci_names.h" + dev_ids_file = "vidix/pci_dev_ids.c" line=0; # print out head lines print_head(vendor_file); -- cgit v1.2.3 From 67d67846264fbe3f0b1559368d04dd9995f7c668 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 16:58:15 +0000 Subject: clean and distclean rules do the same thing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/kernelhelper/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vidix/kernelhelper/Makefile b/vidix/kernelhelper/Makefile index f34e408aaf..4b810ec500 100644 --- a/vidix/kernelhelper/Makefile +++ b/vidix/kernelhelper/Makefile @@ -15,9 +15,7 @@ install: dhahelper.o dep depend: -clean: +clean distclean: rm -f *.o *~ test -distclean: clean - .PHONY: all install dep depend *clean -- cgit v1.2.3 From 5e90929e2d8e775c7fea06b94b965903f5a67de0 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 16:59:26 +0000 Subject: clean and distclean rules do the same thing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26550 b3059339-0415-0410-9bf9-f77b7e298cf2 --- drivers/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index bd58ed7373..39c8a5a5f0 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -28,9 +28,7 @@ install: dep depend: -clean: +clean distclean: rm -f *.o *~ mga_vid_test tdfx_vid_test -distclean: clean - .PHONY: all install dep depend *clean -- cgit v1.2.3 From 83740c48da575c34b027f9484523e0f983e02885 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Apr 2008 18:02:23 +0000 Subject: Merge libmpeg2/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 23 ++++++++++++++++++++--- libmpeg2/Makefile | 20 -------------------- 2 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 libmpeg2/Makefile diff --git a/Makefile b/Makefile index a5a65c5ebc..a636bca0ea 100644 --- a/Makefile +++ b/Makefile @@ -318,7 +318,25 @@ SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ libfaad2/tns.c \ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c -SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c +SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ + libmpeg2/alloc.c \ + libmpeg2/cpu_accel.c\ + libmpeg2/cpu_state.c \ + libmpeg2/decode.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_ARMV4L) += libmpeg2/motion_comp_arm.c \ + libmpeg2/motion_comp_arm_s.S \ + libmpeg2/motion_comp_iwmmxt.c +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 SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c @@ -557,7 +575,6 @@ COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a -COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -579,7 +596,6 @@ PARTS = liba52 \ libavcodec \ libavformat \ libavutil \ - libmpeg2 \ libpostproc \ libswscale \ mp3lib \ @@ -605,6 +621,7 @@ DIRS = dvdread \ libmpcodecs \ libmpcodecs/native \ libmpdemux \ + libmpeg2 \ libvo \ osdep \ stream \ diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile deleted file mode 100644 index 4064251b50..0000000000 --- a/libmpeg2/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libmpeg2.a - -SRCS_COMMON = alloc.c \ - cpu_accel.c\ - cpu_state.c \ - decode.c \ - header.c \ - idct.c \ - motion_comp.c \ - slice.c \ - -SRCS_COMMON-$(HAVE_MMX) += idct_mmx.c motion_comp_mmx.c -SRCS_COMMON-$(HAVE_ALTIVEC) += motion_comp_altivec.c idct_altivec.c -SRCS_COMMON-$(HAVE_VIS) += motion_comp_vis.c -SRCS_COMMON-$(ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c -SRCS_COMMON-$(ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S - -include ../mpcommon.mak -- cgit v1.2.3 From 15aeb0c9ca15f764f121ba9b86ba16ec5c3fe0d3 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 27 Apr 2008 10:34:24 +0000 Subject: Remove unnecessary -lm linker flag from test program compilation command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26552 b3059339-0415-0410-9bf9-f77b7e298cf2 --- liba52/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liba52/Makefile b/liba52/Makefile index 4f80402832..868f8df9a7 100644 --- a/liba52/Makefile +++ b/liba52/Makefile @@ -13,4 +13,4 @@ SRCS_COMMON = crc.c \ include ../mpcommon.mak test: test.c ../cpudetect.o $(LIBNAME_COMMON) - $(CC) $(CFLAGS) -o $@ $^ -lm + $(CC) $(CFLAGS) -o $@ $^ -- cgit v1.2.3 From f9857014b5a8ad705c52831789bceb845c7e7822 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 27 Apr 2008 11:00:06 +0000 Subject: Remove unnecessary compilation command that shadows GNU Make builtin command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26553 b3059339-0415-0410-9bf9-f77b7e298cf2 --- liba52/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/liba52/Makefile b/liba52/Makefile index 868f8df9a7..4ecba8ae59 100644 --- a/liba52/Makefile +++ b/liba52/Makefile @@ -13,4 +13,3 @@ SRCS_COMMON = crc.c \ include ../mpcommon.mak test: test.c ../cpudetect.o $(LIBNAME_COMMON) - $(CC) $(CFLAGS) -o $@ $^ -- cgit v1.2.3 From 835f0aaae6d957300611289c23b95abd6dd05e25 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 27 Apr 2008 11:46:56 +0000 Subject: Merge liba52/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 17 +++++++++++++---- liba52/Makefile | 15 --------------- 2 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 liba52/Makefile diff --git a/Makefile b/Makefile index a636bca0ea..542a5c2f3a 100644 --- a/Makefile +++ b/Makefile @@ -238,7 +238,15 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c -SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c +SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c \ + liba52/crc.c \ + liba52/resample.c \ + liba52/bit_allocate.c \ + liba52/bitstream.c \ + liba52/downmix.c \ + liba52/imdct.c \ + liba52/parse.c \ + SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_bitmap.c \ libass/ass_cache.c \ @@ -574,7 +582,6 @@ COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a -COMMON_LIBS-$(LIBA52) += liba52/liba52.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -592,8 +599,7 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) -PARTS = liba52 \ - libavcodec \ +PARTS = libavcodec \ libavformat \ libavutil \ libpostproc \ @@ -612,6 +618,7 @@ DIRS = dvdread \ gui/wm \ gui/win32 \ input \ + liba52 \ libaf \ libao2 \ libass \ @@ -696,6 +703,8 @@ $(VIDIX_PCI_FILES): vidix/pci.db vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) +liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) + install: install-dirs $(INSTALL_TARGETS) install-dirs: diff --git a/liba52/Makefile b/liba52/Makefile deleted file mode 100644 index 4ecba8ae59..0000000000 --- a/liba52/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = liba52.a - -SRCS_COMMON = crc.c \ - resample.c \ - bit_allocate.c \ - bitstream.c \ - downmix.c \ - imdct.c \ - parse.c \ - -include ../mpcommon.mak - -test: test.c ../cpudetect.o $(LIBNAME_COMMON) -- cgit v1.2.3 From ae09115f2b50e5c5d82383803dbfb25eb8f2e137 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 27 Apr 2008 22:53:18 +0000 Subject: Merge mp3lib/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 19 ++++++++++++++++--- mp3lib/Makefile | 19 ------------------- mpcommon.mak | 1 + 3 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 mp3lib/Makefile diff --git a/Makefile b/Makefile index 542a5c2f3a..3b35539b28 100644 --- a/Makefile +++ b/Makefile @@ -354,7 +354,16 @@ SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ libmpdemux/demux_ogg.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c -SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.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_3DNOW) += mp3lib/dct36_3dnow.c \ + mp3lib/dct64_3dnow.c +SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += 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_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ stream/asf_mmst_streaming.c \ stream/asf_streaming.c \ @@ -581,7 +590,6 @@ COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a COMMON_LIBS-$(WIN32DLL) += loader/loader.a -COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -604,7 +612,6 @@ PARTS = libavcodec \ libavutil \ libpostproc \ libswscale \ - mp3lib \ ifeq ($(WIN32DLL),yes) PARTS += loader @@ -630,6 +637,7 @@ DIRS = dvdread \ libmpdemux \ libmpeg2 \ libvo \ + mp3lib \ osdep \ stream \ stream/freesdp \ @@ -695,6 +703,8 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec +mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer + VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ vidix/pci_names.h vidix/pci_vendors.h @@ -705,6 +715,9 @@ vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) +mp3lib/test: mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm +mp3lib/test2: mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm + install: install-dirs $(INSTALL_TARGETS) install-dirs: diff --git a/mp3lib/Makefile b/mp3lib/Makefile deleted file mode 100644 index f8eb6aa1be..0000000000 --- a/mp3lib/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = mp3lib.a - -SRCS_COMMON = sr1.c -SRCS_COMMON-$(HAVE_MMX) += decode_mmx.c -SRCS_COMMON-$(HAVE_SSE) += dct64_sse.c -SRCS_COMMON-$(ARCH_X86_32) += decode_i586.c -SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX) += dct64_mmx.c -SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c -SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c -SRCS_COMMON-$(HAVE_ALTIVEC) += dct64_altivec.c - -include ../mpcommon.mak - -decode_i586.o: CFLAGS += -fomit-frame-pointer - -%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) - $(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm diff --git a/mpcommon.mak b/mpcommon.mak index afb17121f4..342a3351d9 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -1,5 +1,6 @@ SRCS_COMMON += $(SRCS_COMMON-yes) SRCS_COMMON += $(SRCS_COMMON-yes-yes) +SRCS_COMMON += $(SRCS_COMMON-yes-yes-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) SRCS_MENCODER += $(SRCS_MENCODER-yes) -- cgit v1.2.3