Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved libskin_parser to lib. Added it to link line.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27105 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2010-06-24 11:47:37 +00:00
parent faa9448dfb
commit 936e673954
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/skin_parser/skin_parser.make
View file

@ -11,7 +11,7 @@ SKINP_OBJ := $(call c2obj, $(SKINP_SRC))
OTHER_SRC += $(SKINP_SRC) OTHER_SRC += $(SKINP_SRC)
SKINLIB = $(BUILDDIR)/libskin_parser.a SKINLIB = $(BUILDDIR)/lib/libskin_parser.a
INCLUDES += -I$(SKINP_DIR) INCLUDES += -I$(SKINP_DIR)

1
tools/root.make
View file

@ -162,6 +162,7 @@ $(LINKROM): $(ROMLDS)
$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM) $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM)
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
-L$(BUILDDIR)/firmware -lfirmware \ -L$(BUILDDIR)/firmware -lfirmware \
-L$(BUILDDIR)/lib -lskin_parser \
-L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \
-lgcc $(BOOTBOXLDOPTS) \ -lgcc $(BOOTBOXLDOPTS) \
-T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map