Moved libskin_parser to lib. Added it to link line.
authorzagor <zagor@a1c6a512-1295-4272-9138-f99709370657>
Thu, 24 Jun 2010 11:47:37 +0000 (24 11:47 +0000)
committerzagor <zagor@a1c6a512-1295-4272-9138-f99709370657>
Thu, 24 Jun 2010 11:47:37 +0000 (24 11:47 +0000)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27105 a1c6a512-1295-4272-9138-f99709370657

lib/skin_parser/skin_parser.make
tools/root.make

index c73fc6e..0be85f3 100644 (file)
@@ -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)
 
index 0141a26..686b877 100644 (file)
@@ -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