summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 22:53:18 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-27 22:53:18 +0000
commitae09115f2b50e5c5d82383803dbfb25eb8f2e137 (patch)
tree9393603ba944acf8b9ff3ada500b93bef340ef35 /mp3lib
parent835f0aaae6d957300611289c23b95abd6dd05e25 (diff)
downloadmpv-ae09115f2b50e5c5d82383803dbfb25eb8f2e137.tar.bz2
mpv-ae09115f2b50e5c5d82383803dbfb25eb8f2e137.tar.xz
Merge mp3lib/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/Makefile19
1 files changed, 0 insertions, 19 deletions
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