summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2012-03-18 13:37:49 +0100
committerFrank Gevaerts <frank@gevaerts.be>2012-03-18 13:37:49 +0100
commit0fdbbc3afd05cc0f2c0baa25456713fb19d202b2 (patch)
tree88f528720ae90083f0027a6b1ca5d225a6325144
parent8a7eb4b18c29d56dc0cf9c4d0fe10b2bfb28a94a (diff)
downloadrockbox-0fdbbc3afd05cc0f2c0baa25456713fb19d202b2.tar.gz
rockbox-0fdbbc3afd05cc0f2c0baa25456713fb19d202b2.tar.bz2
rockbox-0fdbbc3afd05cc0f2c0baa25456713fb19d202b2.zip
Add RBCODEC_LIB to android and ypr0 builds so they link again.
Change-Id: I022c7beba844a9b2cfcb8ec7950a1348e4bf511a
-rw-r--r--android/android.make2
-rw-r--r--firmware/target/hosted/ypr0/ypr0.make3
2 files changed, 3 insertions, 2 deletions
diff --git a/android/android.make b/android/android.make
index ae8238e1de..f18b3f958e 100644
--- a/android/android.make
+++ b/android/android.make
@@ -114,7 +114,7 @@ dex: $(DEX)
classes: $(R_OBJ) $(JAVA_OBJ)
-$(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(UNWARMINDER) $(CPUFEAT_BUILD)/cpu-features.o
+$(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(RBCODEC_LIB) $(SKINLIB) $(UNWARMINDER) $(CPUFEAT_BUILD)/cpu-features.o
$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
$(call PRINTS,OC $(@F))$(OC) -S -x $@
diff --git a/firmware/target/hosted/ypr0/ypr0.make b/firmware/target/hosted/ypr0/ypr0.make
index 1b67054183..d74b9058f5 100644
--- a/firmware/target/hosted/ypr0/ypr0.make
+++ b/firmware/target/hosted/ypr0/ypr0.make
@@ -14,9 +14,10 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
.SECONDEXPANSION: # $$(OBJ) is not populated until after this
-$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(UNWARMINDER)
+$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(RBCODEC_LIB) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(UNWARMINDER)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
-L$(BUILDDIR)/firmware -lfirmware \
+ $(RBCODEC_LIB) \
-L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
-L$(BUILDDIR)/lib -lskin_parser \
$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map