Mercurial > mplayer.hg

comparison Makefile @ 26523:43d28f989428

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge mp3lib/Makefile into top-level Makefile.
author diego
date Sun, 27 Apr 2008 22:53:18 +0000
parents 8003ed4cc8b2
children 6cd1f5a6352f
comparison
equal deleted inserted replaced
26522:8003ed4cc8b2 26523:43d28f989428
352 SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c 352 SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
353 SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c 353 SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
354 SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ 354 SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \
355 libmpdemux/demux_ogg.c 355 libmpdemux/demux_ogg.c
356 SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c 356 SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
357 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c 357 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
358 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
359 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \
360 mp3lib/dct64_3dnow.c
361 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += mp3lib/dct36_k7.c \
362 mp3lib/dct64_k7.c
363 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c
364 SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
365 SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c
366 SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE) += mp3lib/dct64_sse.c
358 SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ 367 SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \
359 stream/asf_mmst_streaming.c \ 368 stream/asf_mmst_streaming.c \
360 stream/asf_streaming.c \ 369 stream/asf_streaming.c \
361 stream/cookies.c \ 370 stream/cookies.c \
362 stream/http.c \ 371 stream/http.c \
579 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a 588 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
580 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a 589 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
581 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a 590 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
582 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a 591 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
583 COMMON_LIBS-$(WIN32DLL) += loader/loader.a 592 COMMON_LIBS-$(WIN32DLL) += loader/loader.a
584 COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a
585 593
586 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 594 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
587 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 595 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
588 596
589 COMMON_LIBS += $(COMMON_LIBS-yes) 597 COMMON_LIBS += $(COMMON_LIBS-yes)
602 PARTS = libavcodec \ 610 PARTS = libavcodec \
603 libavformat \ 611 libavformat \
604 libavutil \ 612 libavutil \
605 libpostproc \ 613 libpostproc \
606 libswscale \ 614 libswscale \
607 mp3lib \
608 615
609 ifeq ($(WIN32DLL),yes) 616 ifeq ($(WIN32DLL),yes)
610 PARTS += loader 617 PARTS += loader
611 endif 618 endif
612 619
628 libmpcodecs \ 635 libmpcodecs \
629 libmpcodecs/native \ 636 libmpcodecs/native \
630 libmpdemux \ 637 libmpdemux \
631 libmpeg2 \ 638 libmpeg2 \
632 libvo \ 639 libvo \
640 mp3lib \
633 osdep \ 641 osdep \
634 stream \ 642 stream \
635 stream/freesdp \ 643 stream/freesdp \
636 stream/librtsp \ 644 stream/librtsp \
637 stream/realrtsp \ 645 stream/realrtsp \
693 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" 701 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
694 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE 702 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
695 703
696 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec 704 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
697 705
706 mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
707
698 VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ 708 VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
699 vidix/pci_names.h vidix/pci_vendors.h 709 vidix/pci_names.h vidix/pci_vendors.h
700 710
701 $(VIDIX_PCI_FILES): vidix/pci.db 711 $(VIDIX_PCI_FILES): vidix/pci.db
702 LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) 712 LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB)
703 713
704 vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) 714 vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES)
705 715
706 liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) 716 liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o))
717
718 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
719 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
707 720
708 install: install-dirs $(INSTALL_TARGETS) 721 install: install-dirs $(INSTALL_TARGETS)
709 722
710 install-dirs: 723 install-dirs:
711 $(INSTALL) -d $(BINDIR) 724 $(INSTALL) -d $(BINDIR)