summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2010-06-17 11:10:00 +0000
committerBjörn Stenberg <bjorn@haxx.se>2010-06-17 11:10:00 +0000
commitccaec76d5511a6cf4ffdb9bb2f974acf48789408 (patch)
tree2131e4da7fac2cc0189fef7cd0329ab9d4c8ce32 /tools
parentf1a144a07772d5683d9e117c4639ad75235fd1bc (diff)
downloadrockbox-ccaec76d5511a6cf4ffdb9bb2f974acf48789408.tar.gz
rockbox-ccaec76d5511a6cf4ffdb9bb2f974acf48789408.tar.bz2
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')
-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
ifeq (,$(findstring checkwps,$(APPSDIR)))
ifeq (,$(findstring database,$(APPSDIR)))
include $(FIRMDIR)/firmware.make
+ include $(ROOTDIR)/lib/skin_parser/skin_parser.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make
endif
endif
@@ -158,14 +159,14 @@ $(LINKROM): $(ROMLDS)
$(call PRINTS,PP $(@F))
$(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS))
-$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(LINKRAM)
+$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
-L$(BUILDDIR)/firmware -lfirmware \
-L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
-lgcc $(BOOTBOXLDOPTS) \
-T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
-$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(LINKROM)
+$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
$(VOICESPEEXLIB) $(FIRMLIB) -lgcc -L$(BUILDDIR)/firmware \
-T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map