summaryrefslogtreecommitdiff
path: root/apps/codecs/codecs.make
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2010-07-14 20:07:44 +0000
committerMohamed Tarek <mt@rockbox.org>2010-07-14 20:07:44 +0000
commit26e70eba26c3d6a490d7892a5eb8d12a2a646047 (patch)
treef77d633d11cfd8e0bf7bfc2ee0126d748f78accf /apps/codecs/codecs.make
parentd63abfc7eb7db5eb36b325198fbb6ceaf8778685 (diff)
downloadrockbox-26e70eba26c3d6a490d7892a5eb8d12a2a646047.tar.gz
rockbox-26e70eba26c3d6a490d7892a5eb8d12a2a646047.zip
Remove WMA Pro again from the main build temporarily till the errors/warnings are sorted out.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27418 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/codecs.make')
-rw-r--r--apps/codecs/codecs.make4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 49407db6b8..c137426591 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -37,7 +37,6 @@ include $(APPSDIR)/codecs/libspeex/libspeex.make
37include $(APPSDIR)/codecs/libtremor/libtremor.make 37include $(APPSDIR)/codecs/libtremor/libtremor.make
38include $(APPSDIR)/codecs/libwavpack/libwavpack.make 38include $(APPSDIR)/codecs/libwavpack/libwavpack.make
39include $(APPSDIR)/codecs/libwma/libwma.make 39include $(APPSDIR)/codecs/libwma/libwma.make
40include $(APPSDIR)/codecs/libwmapro/libwmapro.make
41include $(APPSDIR)/codecs/libcook/libcook.make 40include $(APPSDIR)/codecs/libcook/libcook.make
42include $(APPSDIR)/codecs/librm/librm.make 41include $(APPSDIR)/codecs/librm/librm.make
43include $(APPSDIR)/codecs/libatrac/libatrac.make 42include $(APPSDIR)/codecs/libatrac/libatrac.make
@@ -59,7 +58,7 @@ CODEC_CRT0 := $(CODECDIR)/codec_crt0.o
59CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \ 58CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \
60 $(FAADLIB) $(FFMPEGFLACLIB) $(M4ALIB) $(MADLIB) $(MUSEPACKLIB) \ 59 $(FAADLIB) $(FFMPEGFLACLIB) $(M4ALIB) $(MADLIB) $(MUSEPACKLIB) \
61 $(SPCLIB) $(SPEEXLIB) $(TREMORLIB) $(WAVPACKLIB) $(WMALIB) $(COOKLIB) \ 60 $(SPCLIB) $(SPEEXLIB) $(TREMORLIB) $(WAVPACKLIB) $(WMALIB) $(COOKLIB) \
62 $(ATRACLIB) $(WMAPROLIB) \ 61 $(ATRACLIB) \
63 $(CODECLIB) 62 $(CODECLIB)
64 63
65$(CODECS): $(CODEC_CRT0) $(CODECLINK_LDS) 64$(CODECS): $(CODEC_CRT0) $(CODECLINK_LDS)
@@ -84,7 +83,6 @@ $(CODECDIR)/shorten.codec : $(CODECDIR)/libffmpegFLAC.a
84$(CODECDIR)/ape-pre.map : $(CODECDIR)/libdemac-pre.a 83$(CODECDIR)/ape-pre.map : $(CODECDIR)/libdemac-pre.a
85$(CODECDIR)/ape.codec : $(CODECDIR)/libdemac.a 84$(CODECDIR)/ape.codec : $(CODECDIR)/libdemac.a
86$(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a $(CODECDIR)/libasf.a 85$(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a $(CODECDIR)/libasf.a
87$(CODECDIR)/wmapro.codec : $(CODECDIR)/libwmapro.a $(CODECDIR)/libasf.a
88$(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a 86$(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a
89$(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a 87$(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a
90$(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a $(CODECDIR)/librm.a 88$(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a $(CODECDIR)/librm.a