diff options
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/root.make b/tools/root.make index 3231b73053..1bac0d6600 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -95,7 +95,10 @@ else ifneq (,$(findstring database,$(APP_TYPE))) | |||
95 | else ifneq (,$(findstring warble,$(APP_TYPE))) | 95 | else ifneq (,$(findstring warble,$(APP_TYPE))) |
96 | include $(ROOTDIR)/lib/rbcodec/test/warble.make | 96 | include $(ROOTDIR)/lib/rbcodec/test/warble.make |
97 | else | 97 | else |
98 | RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec | ||
99 | RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec | ||
98 | include $(APPSDIR)/apps.make | 100 | include $(APPSDIR)/apps.make |
101 | include $(RBCODEC_DIR)/rbcodec.make | ||
99 | include $(APPSDIR)/lang/lang.make | 102 | include $(APPSDIR)/lang/lang.make |
100 | 103 | ||
101 | ifdef SOFTWARECODECS | 104 | ifdef SOFTWARECODECS |
@@ -205,17 +208,19 @@ $(LINKROM): $(ROMLDS) | |||
205 | $(call PRINTS,PP $(@F)) | 208 | $(call PRINTS,PP $(@F)) |
206 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) | 209 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) |
207 | 210 | ||
208 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) | 211 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) |
209 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 212 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
210 | -L$(BUILDDIR)/firmware -lfirmware \ | 213 | -L$(BUILDDIR)/firmware -lfirmware \ |
214 | -L$(RBCODEC_BLD) -lrbcodec \ | ||
211 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ | 215 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ |
212 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ | 216 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ |
213 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ | 217 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ |
214 | $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map | 218 | $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map |
215 | 219 | ||
216 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) | 220 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) |
217 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 221 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
218 | -L$(BUILDDIR)/firmware -lfirmware \ | 222 | -L$(BUILDDIR)/firmware -lfirmware \ |
223 | -L$(RBCODEC_BLD) -lrbcodec \ | ||
219 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ | 224 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ |
220 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ | 225 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ |
221 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \ | 226 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \ |