github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-16 22:37:28 +01:00
Code Releases Activity

Merge tremor/Makefile into top-level Makefile.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-22 23:05:27 +00:00
parent 8784ae223d
commit 36add9a774
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -86,6 +86,21 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
tremor/block.c \
tremor/codebook.c \
tremor/floor0.c \
tremor/floor1.c \
tremor/framing.c \
tremor/info.c \
tremor/mapping0.c \
tremor/mdct.c \
tremor/registry.c \
tremor/res012.c \
tremor/sharedbook.c \
tremor/synthesis.c \
tremor/window.c \
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
SRCS_MPLAYER = mplayer.c \ SRCS_MPLAYER = mplayer.c \
@ -172,7 +187,6 @@ COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a
COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a
COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a
COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a
COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/tremor.a
COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a
COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
@ -216,7 +230,6 @@ PARTS = dvdread \
libvo \ libvo \
mp3lib \ mp3lib \
stream \ stream \
tremor \
vidix \ vidix \
ifdef ARCH_X86 ifdef ARCH_X86
@ -234,6 +247,7 @@ DIRS = gui \
libass \ libass \
libmenu \ libmenu \
osdep \ osdep \
tremor \
TOOLS \ TOOLS \
all: recurse $(ALL_PRG) all: recurse $(ALL_PRG)

20
tremor/Makefile
View File

@ -1,20 +0,0 @@
include ../config.mak
LIBNAME_COMMON = tremor.a
SRCS_COMMON = bitwise.c \
block.c \
codebook.c \
floor0.c \
floor1.c \
framing.c \
info.c \
mapping0.c \
mdct.c \
registry.c \
res012.c \
sharedbook.c \
synthesis.c \
window.c \
include ../mpcommon.mak