From 936e673954fa98137969658c51743a0280badd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= Date: Thu, 24 Jun 2010 11:47:37 +0000 Subject: [PATCH] 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 --- lib/skin_parser/skin_parser.make | 2 +- tools/root.make | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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