diff options
author | Mohamed Tarek <mt@rockbox.org> | 2009-07-25 15:13:50 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2009-07-25 15:13:50 +0000 |
commit | 8f572ca525bf3812799e627a4a716300e412c244 (patch) | |
tree | b82f70973b43dc25c113a2bcb4e72b5d0362a6d6 | |
parent | 7c4e65bc27db18b9cb150c4159b7aca979f400f2 (diff) | |
download | rockbox-8f572ca525bf3812799e627a4a716300e412c244.tar.gz rockbox-8f572ca525bf3812799e627a4a716300e412c244.zip |
Compile librm separately in preparation for addition of more codecs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22028 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/codecs.make | 3 | ||||
-rw-r--r-- | apps/codecs/libcook/SOURCES | 1 | ||||
-rw-r--r-- | apps/codecs/librm/SOURCES | 1 | ||||
-rw-r--r-- | apps/codecs/librm/librm.make | 25 |
4 files changed, 28 insertions, 2 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index a8c0085cb4..fbe3b1c978 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -34,6 +34,7 @@ include $(APPSDIR)/codecs/libtremor/libtremor.make | |||
34 | include $(APPSDIR)/codecs/libwavpack/libwavpack.make | 34 | include $(APPSDIR)/codecs/libwavpack/libwavpack.make |
35 | include $(APPSDIR)/codecs/libwma/libwma.make | 35 | include $(APPSDIR)/codecs/libwma/libwma.make |
36 | include $(APPSDIR)/codecs/libcook/libcook.make | 36 | include $(APPSDIR)/codecs/libcook/libcook.make |
37 | include $(APPSDIR)/codecs/librm/librm.make | ||
37 | 38 | ||
38 | # compile flags for codecs | 39 | # compile flags for codecs |
39 | CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ | 40 | CODECFLAGS = $(CFLAGS) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ |
@@ -74,7 +75,7 @@ $(CODECDIR)/ape.codec : $(CODECDIR)/libdemac.a | |||
74 | $(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a | 75 | $(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a |
75 | $(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a | 76 | $(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a |
76 | $(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a | 77 | $(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a |
77 | $(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a | 78 | $(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a $(CODECDIR)/librm.a |
78 | 79 | ||
79 | $(CODECS): $(CODECLIB) # this must be last in codec dependency list | 80 | $(CODECS): $(CODECLIB) # this must be last in codec dependency list |
80 | 81 | ||
diff --git a/apps/codecs/libcook/SOURCES b/apps/codecs/libcook/SOURCES index 7b2cd967ea..bfcb24c8cd 100644 --- a/apps/codecs/libcook/SOURCES +++ b/apps/codecs/libcook/SOURCES | |||
@@ -1,3 +1,2 @@ | |||
1 | cook.c | 1 | cook.c |
2 | bitstream.c | 2 | bitstream.c |
3 | ../librm/rm.c | ||
diff --git a/apps/codecs/librm/SOURCES b/apps/codecs/librm/SOURCES new file mode 100644 index 0000000000..e0ff169fae --- /dev/null +++ b/apps/codecs/librm/SOURCES | |||
@@ -0,0 +1 @@ | |||
rm.c | |||
diff --git a/apps/codecs/librm/librm.make b/apps/codecs/librm/librm.make new file mode 100644 index 0000000000..99d89cdab7 --- /dev/null +++ b/apps/codecs/librm/librm.make | |||
@@ -0,0 +1,25 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: librm.make 20151 2009-03-01 09:04:15Z amiconn $ | ||
8 | # | ||
9 | |||
10 | # librm | ||
11 | RMLIB := $(CODECDIR)/librm.a | ||
12 | RMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/librm/SOURCES) | ||
13 | RMLIB_OBJ := $(call c2obj, $(RMLIB_SRC)) | ||
14 | OTHER_SRC += $(RMLIB_SRC) | ||
15 | |||
16 | $(RMLIB): $(RMLIB_OBJ) | ||
17 | $(SILENT)$(shell rm -f $@) | ||
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | ||
19 | |||
20 | RMFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
21 | RMFLAGS += -O3 | ||
22 | |||
23 | $(CODECDIR)/librm/%.o: $(ROOTDIR)/apps/codecs/librm/%.c | ||
24 | $(SILENT)mkdir -p $(dir $@) | ||
25 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(RMFLAGS) -c $< -o $@ | ||