diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-07-29 12:37:48 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-07-29 12:37:48 +0000 |
commit | 2d31d77a8ba231cb03ec35863c4c4ce2024f6509 (patch) | |
tree | b85ca1bede3e83695619064ee9a323f0a8da1865 /tools/root.make | |
parent | e436483b66a931fef6436e9cd3e69eb2b3ff1f7b (diff) | |
download | rockbox-2d31d77a8ba231cb03ec35863c4c4ce2024f6509.tar.gz rockbox-2d31d77a8ba231cb03ec35863c4c4ce2024f6509.zip |
FS#11470 - new skin code, finally svn uses the new parser from the theme editor. This means that a skin that passes the editor WILL pass svn and checkwps (unless the target runs out of skin buffer or something.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27613 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/root.make b/tools/root.make index e53c452022..d90b40f0c6 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -70,6 +70,7 @@ else ifneq (,$(findstring bootbox,$(APPSDIR))) | |||
70 | include $(APPSDIR)/bootbox.make | 70 | include $(APPSDIR)/bootbox.make |
71 | else ifneq (,$(findstring checkwps,$(APPSDIR))) | 71 | else ifneq (,$(findstring checkwps,$(APPSDIR))) |
72 | include $(APPSDIR)/checkwps.make | 72 | include $(APPSDIR)/checkwps.make |
73 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
73 | else ifneq (,$(findstring database,$(APPSDIR))) | 74 | else ifneq (,$(findstring database,$(APPSDIR))) |
74 | include $(APPSDIR)/database.make | 75 | include $(APPSDIR)/database.make |
75 | else | 76 | else |
@@ -170,7 +171,8 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(L | |||
170 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM) | 171 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM) |
171 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 172 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
172 | $(VOICESPEEXLIB) $(FIRMLIB) -lgcc $(GLOBAL_LDOPTS) \ | 173 | $(VOICESPEEXLIB) $(FIRMLIB) -lgcc $(GLOBAL_LDOPTS) \ |
173 | -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map | 174 | -L$(BUILDDIR)/lib -lskin_parser \ |
175 | -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map | ||
174 | 176 | ||
175 | $(BUILDDIR)/rockbox.bin : $(BUILDDIR)/rockbox.elf | 177 | $(BUILDDIR)/rockbox.bin : $(BUILDDIR)/rockbox.elf |
176 | $(call PRINTS,OC $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ | 178 | $(call PRINTS,OC $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ |