diff options
author | Björn Stenberg <bjorn@haxx.se> | 2010-06-17 11:10:00 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2010-06-17 11:10:00 +0000 |
commit | ccaec76d5511a6cf4ffdb9bb2f974acf48789408 (patch) | |
tree | 2131e4da7fac2cc0189fef7cd0329ab9d4c8ce32 /tools/root.make | |
parent | f1a144a07772d5683d9e117c4639ad75235fd1bc (diff) | |
download | rockbox-ccaec76d5511a6cf4ffdb9bb2f974acf48789408.tar.gz rockbox-ccaec76d5511a6cf4ffdb9bb2f974acf48789408.zip |
Added skin_parser library to build system.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26885 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 5 |
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 | |||
58 | ifeq (,$(findstring checkwps,$(APPSDIR))) | 58 | ifeq (,$(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 |
63 | endif | 64 | endif |
@@ -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 |