summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2011-02-24 23:35:16 +0000
committerThomas Jarosch <tomj@simonv.com>2011-02-24 23:35:16 +0000
commite3a3e2c9c2142503b699cfd31f0582eb0666ea08 (patch)
treec392c37bd133b2c538d7b143385f24e6ae1fc005
parent00e5a9c0880a512acbd6c9c421b3d6bad3bcdcc1 (diff)
downloadrockbox-e3a3e2c9c2142503b699cfd31f0582eb0666ea08.tar.gz
rockbox-e3a3e2c9c2142503b699cfd31f0582eb0666ea08.zip
RaaA: Enable plugins for application builds
Use own plugins/SOURCES and plugins/SUBDIRS file to avoid ifdef hell for disabled plugins without a keymap. This finally brings the credits screen to RaaA. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29392 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/SOURCES.app_build41
-rw-r--r--apps/plugins/SUBDIRS.app_build17
-rw-r--r--apps/plugins/plugins.make15
-rw-r--r--firmware/export/config/application.h5
-rwxr-xr-xtools/configure6
5 files changed, 81 insertions, 3 deletions
diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build
new file mode 100644
index 0000000000..ddac2b9ba8
--- /dev/null
+++ b/apps/plugins/SOURCES.app_build
@@ -0,0 +1,41 @@
1/* plugins common to all models */
2credits.c
3properties.c
4random_folder_advance_config.c
5search.c
6sort.c
7theme_remove.c
8vbrfix.c
9
10#ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */
11#ifdef HAVE_ADJUSTABLE_CPU_FREQ
12test_boost.c
13#endif
14#if CONFIG_CODEC == SWCODEC
15test_codec.c
16#endif
17#ifdef HAVE_JPEG
18test_core_jpeg.c
19#endif
20test_disk.c
21#ifdef HAVE_LCD_BITMAP
22#if LCD_DEPTH < 4 && !defined(SIMULATOR)
23test_scanrate.c
24#endif
25#ifndef HAVE_LCD_COLOR
26test_grey.c
27test_greylib_bitmap_scale.c
28#endif
29#endif
30test_mem.c
31#ifdef HAVE_LCD_BITMAP
32test_mem_jpeg.c
33#endif
34#ifdef HAVE_LCD_COLOR
35test_resize.c
36#endif
37#if CONFIG_CODEC == SWCODEC
38test_sampr.c
39#endif
40test_viewports.c
41#endif /* HAVE_TEST_PLUGINS */
diff --git a/apps/plugins/SUBDIRS.app_build b/apps/plugins/SUBDIRS.app_build
new file mode 100644
index 0000000000..dbf4382b62
--- /dev/null
+++ b/apps/plugins/SUBDIRS.app_build
@@ -0,0 +1,17 @@
1/* For all targets with a bitmap display */
2#ifdef HAVE_LCD_BITMAP
3
4#ifdef HAVE_TAGCACHE
5pictureflow
6#endif
7
8#endif /* HAVE_LCD_BITMAP */
9
10/* For all the swcodec targets */
11#if CONFIG_CODEC == SWCODEC
12
13#if MEMORYSIZE > 2 /* we need a lot of RAM for instruments */
14mikmod
15#endif
16
17#endif /* CONFIG_CODEC == SWCODEC */
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 30cf26f621..3271c57303 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -8,7 +8,18 @@
8# 8#
9 9
10# single-file plugins: 10# single-file plugins:
11is_app_build =
12ifdef APP_TYPE
13ifneq ($(APP_TYPE),sdl-sim)
14 is_app_build = yes
15endif
16endif
17
18ifdef is_app_build
19PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build)
20else
11PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES) 21PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES)
22endif
12OTHER_SRC += $(PLUGINS_SRC) 23OTHER_SRC += $(PLUGINS_SRC)
13ROCKS1 := $(PLUGINS_SRC:.c=.rock) 24ROCKS1 := $(PLUGINS_SRC:.c=.rock)
14ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1)) 25ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1))
@@ -36,7 +47,11 @@ endif
36OTHER_SRC += $(ROOTDIR)/apps/plugins/plugin_crt0.c 47OTHER_SRC += $(ROOTDIR)/apps/plugins/plugin_crt0.c
37PLUGIN_CRT0 := $(BUILDDIR)/apps/plugins/plugin_crt0.o 48PLUGIN_CRT0 := $(BUILDDIR)/apps/plugins/plugin_crt0.o
38# multifile plugins (subdirs): 49# multifile plugins (subdirs):
50ifdef is_app_build
51PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS.app_build)
52else
39PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) 53PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
54endif
40 55
41# include <dir>.make from each subdir (yay!) 56# include <dir>.make from each subdir (yay!)
42$(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) 57$(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))
diff --git a/firmware/export/config/application.h b/firmware/export/config/application.h
index 64ebbf3685..0aa4a3f54d 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/application.h
@@ -79,6 +79,11 @@
79/* Define this if you do software codec */ 79/* Define this if you do software codec */
80#define CONFIG_CODEC SWCODEC 80#define CONFIG_CODEC SWCODEC
81 81
82/* Work around debug macro expansion of strncmp in scratchbox */
83#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
84#define _HAVE_STRING_ARCH_strncmp
85#endif
86
82#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) 87#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO))
83#define HAVE_MULTIMEDIA_KEYS 88#define HAVE_MULTIMEDIA_KEYS
84#endif 89#endif
diff --git a/tools/configure b/tools/configure
index 5648438c7b..00572f41c4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2918,7 +2918,7 @@ fi
2918 output="rockbox" 2918 output="rockbox"
2919 bootoutput="rockbox" 2919 bootoutput="rockbox"
2920 appextra="recorder:gui:radio" 2920 appextra="recorder:gui:radio"
2921 plugins="" 2921 plugins="yes"
2922 swcodec="yes" 2922 swcodec="yes"
2923 # architecture, manufacturer and model for the target-tree build 2923 # architecture, manufacturer and model for the target-tree build
2924 t_cpu="hosted" 2924 t_cpu="hosted"
@@ -2974,7 +2974,7 @@ fi
2974 output="rockbox" 2974 output="rockbox"
2975 bootoutput="rockbox" 2975 bootoutput="rockbox"
2976 appextra="recorder:gui:radio" 2976 appextra="recorder:gui:radio"
2977 plugins="" 2977 plugins="yes"
2978 swcodec="yes" 2978 swcodec="yes"
2979 # architecture, manufacturer and model for the target-tree build 2979 # architecture, manufacturer and model for the target-tree build
2980 t_cpu="hosted" 2980 t_cpu="hosted"
@@ -3002,7 +3002,7 @@ fi
3002 output="rockbox" 3002 output="rockbox"
3003 bootoutput="rockbox" 3003 bootoutput="rockbox"
3004 appextra="recorder:gui:radio" 3004 appextra="recorder:gui:radio"
3005 plugins="" 3005 plugins="yes"
3006 swcodec="yes" 3006 swcodec="yes"
3007 # architecture, manufacturer and model for the target-tree build 3007 # architecture, manufacturer and model for the target-tree build
3008 t_cpu="hosted" 3008 t_cpu="hosted"