github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

Merge liba52/Makefile into top-level Makefile.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-27 11:46:56 +00:00
parent f9857014b5
commit 835f0aaae6
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -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:

15
liba52/Makefile
View File

@ -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)