diff options
author | Mohamed Tarek <mt@rockbox.org> | 2010-07-14 20:07:44 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2010-07-14 20:07:44 +0000 |
commit | 26e70eba26c3d6a490d7892a5eb8d12a2a646047 (patch) | |
tree | f77d633d11cfd8e0bf7bfc2ee0126d748f78accf | |
parent | d63abfc7eb7db5eb36b325198fbb6ceaf8778685 (diff) | |
download | rockbox-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
-rw-r--r-- | apps/codecs/SOURCES | 1 | ||||
-rw-r--r-- | apps/codecs/codecs.make | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES index 1c484c4dcc..ca50529aed 100644 --- a/apps/codecs/SOURCES +++ b/apps/codecs/SOURCES | |||
@@ -16,7 +16,6 @@ atrac3_rm.c | |||
16 | atrac3_oma.c | 16 | atrac3_oma.c |
17 | mpc.c | 17 | mpc.c |
18 | wma.c | 18 | wma.c |
19 | wmapro.c | ||
20 | sid.c | 19 | sid.c |
21 | ape.c | 20 | ape.c |
22 | nsf.c | 21 | nsf.c |
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 | |||
37 | include $(APPSDIR)/codecs/libtremor/libtremor.make | 37 | include $(APPSDIR)/codecs/libtremor/libtremor.make |
38 | include $(APPSDIR)/codecs/libwavpack/libwavpack.make | 38 | include $(APPSDIR)/codecs/libwavpack/libwavpack.make |
39 | include $(APPSDIR)/codecs/libwma/libwma.make | 39 | include $(APPSDIR)/codecs/libwma/libwma.make |
40 | include $(APPSDIR)/codecs/libwmapro/libwmapro.make | ||
41 | include $(APPSDIR)/codecs/libcook/libcook.make | 40 | include $(APPSDIR)/codecs/libcook/libcook.make |
42 | include $(APPSDIR)/codecs/librm/librm.make | 41 | include $(APPSDIR)/codecs/librm/librm.make |
43 | include $(APPSDIR)/codecs/libatrac/libatrac.make | 42 | include $(APPSDIR)/codecs/libatrac/libatrac.make |
@@ -59,7 +58,7 @@ CODEC_CRT0 := $(CODECDIR)/codec_crt0.o | |||
59 | CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \ | 58 | CODECLIBS := $(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 |