diff options
author | Björn Stenberg <bjorn@haxx.se> | 2010-06-24 11:47:37 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2010-06-24 11:47:37 +0000 |
commit | 936e673954fa98137969658c51743a0280badd7b (patch) | |
tree | cb2d74f3f24f300baf4db167a1ef06f373fec524 | |
parent | faa9448dfb3920b16aa51773df64cb83fff1ec4c (diff) | |
download | rockbox-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.make | 2 | ||||
-rw-r--r-- | tools/root.make | 1 |
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)) | |||
11 | 11 | ||
12 | OTHER_SRC += $(SKINP_SRC) | 12 | OTHER_SRC += $(SKINP_SRC) |
13 | 13 | ||
14 | SKINLIB = $(BUILDDIR)/libskin_parser.a | 14 | SKINLIB = $(BUILDDIR)/lib/libskin_parser.a |
15 | 15 | ||
16 | INCLUDES += -I$(SKINP_DIR) | 16 | INCLUDES += -I$(SKINP_DIR) |
17 | 17 | ||
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) | |||
162 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM) | 162 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM) |
163 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 163 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
164 | -L$(BUILDDIR)/firmware -lfirmware \ | 164 | -L$(BUILDDIR)/firmware -lfirmware \ |
165 | -L$(BUILDDIR)/lib -lskin_parser \ | ||
165 | -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ | 166 | -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ |
166 | -lgcc $(BOOTBOXLDOPTS) \ | 167 | -lgcc $(BOOTBOXLDOPTS) \ |
167 | -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map | 168 | -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map |