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/codecs.make | |
| 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/codecs.make')
| -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 include $(APPSDIR)/codecs/lib/libcodec.make OTHER_INC += -I$(APPSDIR)/codecs/lib +# extra libraries +CODEC_LIBS := $(EXTRA_LIBS) $(TLSFLIB) $(CODECLIB) + # the codec libraries include $(APPSDIR)/codecs/demac/libdemac.make include $(APPSDIR)/codecs/liba52/liba52.make @@ -135,7 +138,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a -$(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) +$(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a @@ -168,10 +171,7 @@ $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a $(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a -$(CODECS): $(CODECLIB) # this must be last in codec dependency list - -# libfaad and libmusepack both contain a huffman.h file, with different -# content. So we compile them with special command lines: +$(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list # pattern rule for compiling codecs $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c @@ -194,14 +194,13 @@ else endif CODECLDFLAGS += $(GLOBAL_LDOPTS) -$(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECLIB) +$(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ $(filter %.o, $^) \ - $(filter-out $(CODECLIB),$(filter %.a, $+)) \ - $(CODECLIB) \ + $(filter-out $(CODECLIB),$(filter %.a, $+)) $(CODECLIB) \ -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) -$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) $(LIBARMSUPPORT) +$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ $(filter %.o, $^) \ $(filter %.a, $+) \ |