summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2010-06-24 11:47:37 +0000
committerBjörn Stenberg <bjorn@haxx.se>2010-06-24 11:47:37 +0000
commit936e673954fa98137969658c51743a0280badd7b (patch)
treecb2d74f3f24f300baf4db167a1ef06f373fec524
parentfaa9448dfb3920b16aa51773df64cb83fff1ec4c (diff)
downloadrockbox-936e673954fa98137969658c51743a0280badd7b.tar.gz
rockbox-936e673954fa98137969658c51743a0280badd7b.zip
Moved libskin_parser to lib. Added it to link line.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27105 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--lib/skin_parser/skin_parser.make2
-rw-r--r--tools/root.make1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/skin_parser/skin_parser.make b/lib/skin_parser/skin_parser.make
index c73fc6ef00..0be85f3e58 100644
--- a/lib/skin_parser/skin_parser.make
+++ b/lib/skin_parser/skin_parser.make
@@ -11,7 +11,7 @@ SKINP_OBJ := $(call c2obj, $(SKINP_SRC))
OTHER_SRC += $(SKINP_SRC)
-SKINLIB = $(BUILDDIR)/libskin_parser.a
+SKINLIB = $(BUILDDIR)/lib/libskin_parser.a
INCLUDES += -I$(SKINP_DIR)
diff --git a/tools/root.make b/tools/root.make
index 0141a26b64..686b877491 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -162,6 +162,7 @@ $(LINKROM): $(ROMLDS)
$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
-L$(BUILDDIR)/firmware -lfirmware \
+ -L$(BUILDDIR)/lib -lskin_parser \
-L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
-lgcc $(BOOTBOXLDOPTS) \
-T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map