summaryrefslogtreecommitdiffstats
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.tar.bz2
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 @@
+/* plugins common to all models */
+credits.c
+properties.c
+random_folder_advance_config.c
+search.c
+sort.c
+theme_remove.c
+vbrfix.c
+
+#ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+test_boost.c
+#endif
+#if CONFIG_CODEC == SWCODEC
+test_codec.c
+#endif
+#ifdef HAVE_JPEG
+test_core_jpeg.c
+#endif
+test_disk.c
+#ifdef HAVE_LCD_BITMAP
+#if LCD_DEPTH < 4 && !defined(SIMULATOR)
+test_scanrate.c
+#endif
+#ifndef HAVE_LCD_COLOR
+test_grey.c
+test_greylib_bitmap_scale.c
+#endif
+#endif
+test_mem.c
+#ifdef HAVE_LCD_BITMAP
+test_mem_jpeg.c
+#endif
+#ifdef HAVE_LCD_COLOR
+test_resize.c
+#endif
+#if CONFIG_CODEC == SWCODEC
+test_sampr.c
+#endif
+test_viewports.c
+#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 @@
+/* For all targets with a bitmap display */
+#ifdef HAVE_LCD_BITMAP
+
+#ifdef HAVE_TAGCACHE
+pictureflow
+#endif
+
+#endif /* HAVE_LCD_BITMAP */
+
+/* For all the swcodec targets */
+#if CONFIG_CODEC == SWCODEC
+
+#if MEMORYSIZE > 2 /* we need a lot of RAM for instruments */
+mikmod
+#endif
+
+#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 @@
#
# single-file plugins:
+is_app_build =
+ifdef APP_TYPE
+ifneq ($(APP_TYPE),sdl-sim)
+ is_app_build = yes
+endif
+endif
+
+ifdef is_app_build
+PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build)
+else
PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES)
+endif
OTHER_SRC += $(PLUGINS_SRC)
ROCKS1 := $(PLUGINS_SRC:.c=.rock)
ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1))
@@ -36,7 +47,11 @@ endif
OTHER_SRC += $(ROOTDIR)/apps/plugins/plugin_crt0.c
PLUGIN_CRT0 := $(BUILDDIR)/apps/plugins/plugin_crt0.o
# multifile plugins (subdirs):
+ifdef is_app_build
+PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS.app_build)
+else
PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
+endif
# include <dir>.make from each subdir (yay!)
$(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 @@
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC
+/* Work around debug macro expansion of strncmp in scratchbox */
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+#define _HAVE_STRING_ARCH_strncmp
+#endif
+
#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO))
#define HAVE_MULTIMEDIA_KEYS
#endif
diff --git a/tools/configure b/tools/configure
index 5648438c7b..00572f41c4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2918,7 +2918,7 @@ fi
output="rockbox"
bootoutput="rockbox"
appextra="recorder:gui:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
# architecture, manufacturer and model for the target-tree build
t_cpu="hosted"
@@ -2974,7 +2974,7 @@ fi
output="rockbox"
bootoutput="rockbox"
appextra="recorder:gui:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
# architecture, manufacturer and model for the target-tree build
t_cpu="hosted"
@@ -3002,7 +3002,7 @@ fi
output="rockbox"
bootoutput="rockbox"
appextra="recorder:gui:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
# architecture, manufacturer and model for the target-tree build
t_cpu="hosted"