summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/root.make5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/root.make b/tools/root.make
index ddea297ccf..af78133a8d 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -58,6 +58,7 @@ include $(TOOLSDIR)/tools.make
58ifeq (,$(findstring checkwps,$(APPSDIR))) 58ifeq (,$(findstring checkwps,$(APPSDIR)))
59 ifeq (,$(findstring database,$(APPSDIR))) 59 ifeq (,$(findstring database,$(APPSDIR)))
60 include $(FIRMDIR)/firmware.make 60 include $(FIRMDIR)/firmware.make
61 include $(ROOTDIR)/lib/skin_parser/skin_parser.make
61 include $(ROOTDIR)/apps/bitmaps/bitmaps.make 62 include $(ROOTDIR)/apps/bitmaps/bitmaps.make
62 endif 63 endif
63endif 64endif
@@ -158,14 +159,14 @@ $(LINKROM): $(ROMLDS)
158 $(call PRINTS,PP $(@F)) 159 $(call PRINTS,PP $(@F))
159 $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) 160 $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))
160 161
161$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(LINKRAM) 162$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM)
162 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ 163 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
163 -L$(BUILDDIR)/firmware -lfirmware \ 164 -L$(BUILDDIR)/firmware -lfirmware \
164 -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ 165 -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
165 -lgcc $(BOOTBOXLDOPTS) \ 166 -lgcc $(BOOTBOXLDOPTS) \
166 -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map 167 -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
167 168
168$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(LINKROM) 169$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM)
169 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ 170 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
170 $(VOICESPEEXLIB) $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware \ 171 $(VOICESPEEXLIB) $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware \
171 -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map 172 -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map