diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:24:57 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:27:40 +0200 |
commit | f269aa0060950f7b9c42216267c639a2fb556196 (patch) | |
tree | 218ad3a737f11cb18e48676f300bc22038cfa140 /apps/codecs | |
parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
download | rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz rockbox-f269aa0060950f7b9c42216267c639a2fb556196.zip |
build system: unify/simplify library handling a bit.
libs in $ROOT/lib now add to $(CORE_LIBS) and $(EXTRA_LIBS) and are
automatically linked by the core and codecs/plugins respectively.
Change-Id: Iff482c792a8c8142718f6a16a450c6e2f1497c9a
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/codecs.make | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 55002b229b..37713015ad 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -21,6 +21,9 @@ include $(APPSDIR)/codecs/lib/tlsf/libtlsf.make | |||
21 | include $(APPSDIR)/codecs/lib/libcodec.make | 21 | include $(APPSDIR)/codecs/lib/libcodec.make |
22 | OTHER_INC += -I$(APPSDIR)/codecs/lib | 22 | OTHER_INC += -I$(APPSDIR)/codecs/lib |
23 | 23 | ||
24 | # extra libraries | ||
25 | CODEC_LIBS := $(EXTRA_LIBS) $(TLSFLIB) $(CODECLIB) | ||
26 | |||
24 | # the codec libraries | 27 | # the codec libraries |
25 | include $(APPSDIR)/codecs/demac/libdemac.make | 28 | include $(APPSDIR)/codecs/demac/libdemac.make |
26 | include $(APPSDIR)/codecs/liba52/liba52.make | 29 | include $(APPSDIR)/codecs/liba52/liba52.make |
@@ -135,7 +138,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a | |||
135 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a | 138 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a |
136 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a | 139 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a |
137 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a | 140 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a |
138 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) | 141 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a |
139 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a | 142 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a |
140 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a | 143 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a |
141 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a | 144 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a |
@@ -168,10 +171,7 @@ $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a | |||
168 | $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a | 171 | $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a |
169 | $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a | 172 | $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a |
170 | 173 | ||
171 | $(CODECS): $(CODECLIB) # this must be last in codec dependency list | 174 | $(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list |
172 | |||
173 | # libfaad and libmusepack both contain a huffman.h file, with different | ||
174 | # content. So we compile them with special command lines: | ||
175 | 175 | ||
176 | # pattern rule for compiling codecs | 176 | # pattern rule for compiling codecs |
177 | $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c | 177 | $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c |
@@ -194,14 +194,13 @@ else | |||
194 | endif | 194 | endif |
195 | CODECLDFLAGS += $(GLOBAL_LDOPTS) | 195 | CODECLDFLAGS += $(GLOBAL_LDOPTS) |
196 | 196 | ||
197 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECLIB) | 197 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) |
198 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ | 198 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ |
199 | $(filter %.o, $^) \ | 199 | $(filter %.o, $^) \ |
200 | $(filter-out $(CODECLIB),$(filter %.a, $+)) \ | 200 | $(filter-out $(CODECLIB),$(filter %.a, $+)) $(CODECLIB) \ |
201 | $(CODECLIB) \ | ||
202 | -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) | 201 | -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) |
203 | 202 | ||
204 | $(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) $(LIBARMSUPPORT) | 203 | $(CODECDIR)/%.codec: $(CODECDIR)/%.o |
205 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ | 204 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ |
206 | $(filter %.o, $^) \ | 205 | $(filter %.o, $^) \ |
207 | $(filter %.a, $+) \ | 206 | $(filter %.a, $+) \ |