diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-27 16:27:02 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-28 23:02:39 +0200 |
commit | c56950ea3a9e0244461ce445f25bd7a80c8f7199 (patch) | |
tree | 6fb9547aebb230ec15b26db11867a4072d2a6d7b | |
parent | 9f2ee2f21abec56108dfb135eaeba5f416f1eb12 (diff) | |
download | rockbox-c56950ea3a9e0244461ce445f25bd7a80c8f7199.tar.gz rockbox-c56950ea3a9e0244461ce445f25bd7a80c8f7199.zip |
tlsf: move to /lib (it's also used by plugins).
Change-Id: I5e37b28c1ce4608d60b036343f280af3311ad490
-rw-r--r-- | apps/codecs/codecs.make | 5 | ||||
-rw-r--r-- | apps/codecs/libtremor/oggmalloc.c | 2 | ||||
-rw-r--r-- | apps/codecs/vorbis.c | 2 | ||||
-rw-r--r-- | apps/plugins/mikmod/mikmod_supp.h | 2 | ||||
-rw-r--r-- | apps/plugins/pdbox/pdbox.h | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | lib/tlsf/COPYING (renamed from apps/codecs/lib/tlsf/COPYING) | 0 | ||||
-rw-r--r-- | lib/tlsf/Changelog (renamed from apps/codecs/lib/tlsf/Changelog) | 0 | ||||
-rw-r--r-- | lib/tlsf/README (renamed from apps/codecs/lib/tlsf/README) | 0 | ||||
-rw-r--r-- | lib/tlsf/SOURCES (renamed from apps/codecs/lib/tlsf/SOURCES) | 0 | ||||
-rw-r--r-- | lib/tlsf/TODO (renamed from apps/codecs/lib/tlsf/TODO) | 0 | ||||
-rw-r--r-- | lib/tlsf/libtlsf.make (renamed from apps/codecs/lib/tlsf/libtlsf.make) | 33 | ||||
-rw-r--r-- | lib/tlsf/src/target.h (renamed from apps/codecs/lib/tlsf/src/target.h) | 0 | ||||
-rw-r--r-- | lib/tlsf/src/tlsf.c (renamed from apps/codecs/lib/tlsf/src/tlsf.c) | 0 | ||||
-rw-r--r-- | lib/tlsf/src/tlsf.h (renamed from apps/codecs/lib/tlsf/src/tlsf.h) | 0 | ||||
-rw-r--r-- | tools/root.make | 1 |
16 files changed, 24 insertions, 25 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 37713015ad..605d8a3556 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -14,15 +14,12 @@ OTHER_SRC += $(CODECS_SRC) | |||
14 | CODECS := $(CODECS_SRC:.c=.codec) | 14 | CODECS := $(CODECS_SRC:.c=.codec) |
15 | CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS)) | 15 | CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS)) |
16 | 16 | ||
17 | # TLSF memory allocator library | ||
18 | include $(APPSDIR)/codecs/lib/tlsf/libtlsf.make | ||
19 | |||
20 | # the codec helper library | 17 | # the codec helper library |
21 | include $(APPSDIR)/codecs/lib/libcodec.make | 18 | include $(APPSDIR)/codecs/lib/libcodec.make |
22 | OTHER_INC += -I$(APPSDIR)/codecs/lib | 19 | OTHER_INC += -I$(APPSDIR)/codecs/lib |
23 | 20 | ||
24 | # extra libraries | 21 | # extra libraries |
25 | CODEC_LIBS := $(EXTRA_LIBS) $(TLSFLIB) $(CODECLIB) | 22 | CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB) |
26 | 23 | ||
27 | # the codec libraries | 24 | # the codec libraries |
28 | include $(APPSDIR)/codecs/demac/libdemac.make | 25 | include $(APPSDIR)/codecs/demac/libdemac.make |
diff --git a/apps/codecs/libtremor/oggmalloc.c b/apps/codecs/libtremor/oggmalloc.c index dd7fd5b69d..783e0f7240 100644 --- a/apps/codecs/libtremor/oggmalloc.c +++ b/apps/codecs/libtremor/oggmalloc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include "os_types.h" | 1 | #include "os_types.h" |
2 | #include "../lib/tlsf/src/tlsf.h" | 2 | #include <tlsf.h> |
3 | 3 | ||
4 | #if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) | 4 | #if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) |
5 | #include <setjmp.h> | 5 | #include <setjmp.h> |
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c index 7004913e70..944dd6d60c 100644 --- a/apps/codecs/vorbis.c +++ b/apps/codecs/vorbis.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "libtremor/ivorbisfile.h" | 23 | #include "libtremor/ivorbisfile.h" |
24 | #include "libtremor/ogg.h" | 24 | #include "libtremor/ogg.h" |
25 | #ifdef SIMULATOR | 25 | #ifdef SIMULATOR |
26 | #include "lib/tlsf/src/tlsf.h" | 26 | #include <tlsf.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | CODEC_HEADER | 29 | CODEC_HEADER |
diff --git a/apps/plugins/mikmod/mikmod_supp.h b/apps/plugins/mikmod/mikmod_supp.h index 1b6bd76b76..c76c283b92 100644 --- a/apps/plugins/mikmod/mikmod_supp.h +++ b/apps/plugins/mikmod/mikmod_supp.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include "plugin.h" | 2 | #include "plugin.h" |
3 | #include "inttypes.h" | 3 | #include "inttypes.h" |
4 | #include "codecs/lib/tlsf/src/tlsf.h" | 4 | #include <tlsf.h> |
5 | 5 | ||
6 | #ifndef MIKMOD_SUPP_H | 6 | #ifndef MIKMOD_SUPP_H |
7 | #define MIKMOD_SUPP_H | 7 | #define MIKMOD_SUPP_H |
diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h index b53e15f94e..ddc6ed2cf4 100644 --- a/apps/plugins/pdbox/pdbox.h +++ b/apps/plugins/pdbox/pdbox.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #define PDBOX_H | 23 | #define PDBOX_H |
24 | 24 | ||
25 | /* Use TLSF. */ | 25 | /* Use TLSF. */ |
26 | #include "codecs/lib/tlsf/src/tlsf.h" | 26 | #include <tlsf.h> |
27 | 27 | ||
28 | /* Pure Data */ | 28 | /* Pure Data */ |
29 | #include "PDa/src/m_pd.h" | 29 | #include "PDa/src/m_pd.h" |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 67b0d83932..b80523d41b 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -53,7 +53,7 @@ else | |||
53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) | 53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) |
54 | endif | 54 | endif |
55 | 55 | ||
56 | PLUGIN_LIBS := $(EXTRA_LIBS) $(TLSFLIB) $(PLUGINLIB) $(PLUGINBITMAPLIB) | 56 | PLUGIN_LIBS := $(EXTRA_LIBS) $(PLUGINLIB) $(PLUGINBITMAPLIB) |
57 | 57 | ||
58 | # include <dir>.make from each subdir (yay!) | 58 | # include <dir>.make from each subdir (yay!) |
59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | 59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) |
diff --git a/apps/codecs/lib/tlsf/COPYING b/lib/tlsf/COPYING index 78fdbdc061..78fdbdc061 100644 --- a/apps/codecs/lib/tlsf/COPYING +++ b/lib/tlsf/COPYING | |||
diff --git a/apps/codecs/lib/tlsf/Changelog b/lib/tlsf/Changelog index 0cdb34a8ab..0cdb34a8ab 100644 --- a/apps/codecs/lib/tlsf/Changelog +++ b/lib/tlsf/Changelog | |||
diff --git a/apps/codecs/lib/tlsf/README b/lib/tlsf/README index d755905b16..d755905b16 100644 --- a/apps/codecs/lib/tlsf/README +++ b/lib/tlsf/README | |||
diff --git a/apps/codecs/lib/tlsf/SOURCES b/lib/tlsf/SOURCES index eb9d93756e..eb9d93756e 100644 --- a/apps/codecs/lib/tlsf/SOURCES +++ b/lib/tlsf/SOURCES | |||
diff --git a/apps/codecs/lib/tlsf/TODO b/lib/tlsf/TODO index d7c07b8421..d7c07b8421 100644 --- a/apps/codecs/lib/tlsf/TODO +++ b/lib/tlsf/TODO | |||
diff --git a/apps/codecs/lib/tlsf/libtlsf.make b/lib/tlsf/libtlsf.make index 2072a4566e..cb61a5c09e 100644 --- a/apps/codecs/lib/tlsf/libtlsf.make +++ b/lib/tlsf/libtlsf.make | |||
@@ -7,27 +7,28 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | TLSFLIB := $(CODECDIR)/libtlsf.a | 10 | TLSFLIB_DIR := $(ROOTDIR)/lib/tlsf |
11 | TLSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/lib/tlsf/SOURCES) | 11 | TLSFLIB_SRC := $(call preprocess, $(TLSFLIB_DIR)/SOURCES) |
12 | TLSFLIB_OBJ := $(call c2obj, $(TLSFLIB_SRC)) | 12 | TLSFLIB_OBJ := $(call c2obj, $(TLSFLIB_SRC)) |
13 | OTHER_SRC += $(TLSFLIB_SRC) | 13 | TLSFLIB := $(BUILDDIR)/lib/libtlsf.a |
14 | 14 | ||
15 | $(TLSFLIB): $(TLSFLIB_OBJ) | 15 | OTHER_SRC += $(TLSFLIB_SRC) |
16 | $(SILENT)$(shell rm -f $@) | 16 | INCLUDES += -I$(TLSFLIB_DIR)/src |
17 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 17 | EXTRA_LIBS += $(TLSFLIB) |
18 | 18 | ||
19 | TLSFLIBFLAGS = $(CODECFLAGS) | 19 | TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) |
20 | 20 | ||
21 | ifdef APP_TYPE | 21 | # Enable statistics in the sim |
22 | TLSFLIBFLAGS += -DTLSF_STATISTIC=1 | ||
23 | endif | ||
24 | |||
25 | # Do not use '-ffunction-sections' when compiling sdl-sim | ||
26 | ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) | 22 | ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim) |
27 | TLSFLIBFLAGS += -ffunction-sections | 23 | TLSFLIBFLAGS += -DTLSF_STATISTIC=1 |
28 | endif | 24 | endif |
29 | 25 | ||
30 | $(CODECDIR)/lib/tlsf/src/%.o: $(APPSDIR)/codecs/lib/tlsf/src/%.c | 26 | # special rules for tlsf |
27 | $(BUILDDIR)/lib/tlsf/src/%.o: $(TLSFLIB_DIR)/src/%.c | ||
31 | $(SILENT)mkdir -p $(dir $@) | 28 | $(SILENT)mkdir -p $(dir $@) |
32 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 29 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -c $< -o $@ \ |
33 | -I$(dir $<) $(TLSFLIBFLAGS) -c $< -o $@ | 30 | -I$(TLSFLIB_DIR)/src $(TLSFLIBFLAGS) |
31 | |||
32 | $(TLSFLIB): $(TLSFLIB_OBJ) | ||
33 | $(SILENT)$(shell rm -f $@) | ||
34 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | ||
diff --git a/apps/codecs/lib/tlsf/src/target.h b/lib/tlsf/src/target.h index 1afd62aef2..1afd62aef2 100644 --- a/apps/codecs/lib/tlsf/src/target.h +++ b/lib/tlsf/src/target.h | |||
diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/lib/tlsf/src/tlsf.c index 87f8d262ee..87f8d262ee 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.c +++ b/lib/tlsf/src/tlsf.c | |||
diff --git a/apps/codecs/lib/tlsf/src/tlsf.h b/lib/tlsf/src/tlsf.h index 4feb5c42cc..4feb5c42cc 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.h +++ b/lib/tlsf/src/tlsf.h | |||
diff --git a/tools/root.make b/tools/root.make index 4a1aaaf8d8..51886a09f9 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -70,6 +70,7 @@ ifeq (,$(findstring checkwps,$(APP_TYPE))) | |||
70 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 70 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make |
71 | ifeq (,$(findstring bootloader,$(APPSDIR))) | 71 | ifeq (,$(findstring bootloader,$(APPSDIR))) |
72 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | 72 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make |
73 | include $(ROOTDIR)/lib/tlsf/libtlsf.make | ||
73 | endif | 74 | endif |
74 | endif | 75 | endif |
75 | endif | 76 | endif |