Rockbox.org home
release
dev builds
extras
themes manual
wiki
device status forums
mailing lists
IRC bugs
patches
dev guide



Rockbox mail archive

Subject: [PATCH] Remove some functions & menu entries if plugins are not enabled

[PATCH] Remove some functions & menu entries if plugins are not enabled

From: Rafaël Carré <rafael.carre_at_gmail.com>
Date: Mon, 4 Oct 2010 11:17:34 +0200

Android menu is nicer (no plugins entry)
plugins is set to 0 or 1 in configure so it can be used in preprocessor
and Makefile
Breaks theming, because some places use plugin_get_buffer() as temp
buffer.

---
 apps/apps.make           |    2 +-
 apps/filetree.c          |    4 +
 apps/filetypes.c         |    4 +
 apps/menus/main_menu.c   |    2 +
 apps/onplay.c            |    4 +
 apps/plugin.c            |   11 ++++
 apps/root_menu.c         |   15 +++++-
 apps/tree.c              |    5 +-
 firmware/export/config.h |    2 +-
 tools/configure          |  138 +++++++++++++++++++++++-----------------------
 tools/root.make          |    2 +-
 11 files changed, 115 insertions(+), 74 deletions(-)
diff --git a/apps/apps.make b/apps/apps.make
index 6afcd12..5de55b8 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -8,7 +8,7 @@
 #
 
 INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
-SRC += $(call preprocess, $(APPSDIR)/SOURCES)
+SRC += $(call preprocess, $(APPSDIR)/SOURCES, -DENABLEDPLUGINS=$(ENABLEDPLUGINS))
 
 # apps/features.txt is a file that (is preprocessed and) lists named features
 # based on defines in the config-*.h files. The named features will be passed
diff --git a/apps/filetree.c b/apps/filetree.c
index 1dc510f..e55255d 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -602,6 +602,7 @@ int ft_enter(struct tree_context* c)
                 break;
 #endif
 
+#if ENABLEDPLUGINS
                 /* plugin file */
             case FILE_ATTR_ROCK:
             case FILE_ATTR_LUA:
@@ -642,6 +643,7 @@ int ft_enter(struct tree_context* c)
                 }
                 break;
             }
+#endif /* ENABLEDPLUGINS */
             case FILE_ATTR_CUE:
                 display_cuesheet_content(buf);
                 break;
@@ -655,6 +657,7 @@ int ft_enter(struct tree_context* c)
                     break;
                 }
 
+#if ENABLEDPLUGINS
                 plugin = filetype_get_plugin(file);
                 if (plugin)
                 {
@@ -675,6 +678,7 @@ int ft_enter(struct tree_context* c)
                     }
                 }
                 break;
+#endif /* ENABLEDPLUGINS */
             }
         }
 
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 28a2da6..c24b76e 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -119,8 +119,10 @@ static const struct filetype inbuilt_filetypes[] = {
     { "fms", FILE_ATTR_FMS, Icon_Wps, VOICE_EXT_FMS },
 #endif
     { "lng", FILE_ATTR_LNG, Icon_Language, LANG_LANGUAGE },
+#if ENABLEDPLUGINS
     { "rock",FILE_ATTR_ROCK,Icon_Plugin,   VOICE_EXT_ROCK },
     { "lua", FILE_ATTR_LUA, Icon_Plugin,   VOICE_EXT_ROCK },
+#endif
 #ifdef HAVE_LCD_BITMAP
     { "fnt", FILE_ATTR_FONT,Icon_Font,     VOICE_EXT_FONT },
     { "kbd", FILE_ATTR_KBD, Icon_Keyboard, VOICE_EXT_KBD },
@@ -455,6 +457,7 @@ bool  filetype_supported(int attr)
     return find_attr(attr) >= 0;
 }
 
+#if ENABLEDPLUGINS
 /**** Open With Screen ****/
 struct cb_data {
     int *items;
@@ -559,3 +562,4 @@ int filetype_load_plugin(const char* plugin, char* file)
              PLUGIN_DIR, filetypes[i].plugin, ROCK_EXTENSION);
     return plugin_load(plugin_name, file);
 }
+#endif /* ENABLEDPLUGINS */
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 1d22dba..3d7a885 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -115,7 +115,9 @@ static bool show_credits(void)
 {
     char credits[MAX_PATH] = { '\0' };
     snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR);
+#if ENABLEDPLUGINS
     if (plugin_load(credits, NULL) != PLUGIN_OK)
+#endif
     {
         /* show the rockbox logo and version untill a button is pressed */
         show_logo();
diff --git a/apps/onplay.c b/apps/onplay.c
index 92864f5..a41f1d3 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -991,17 +991,21 @@ MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR),
 /* other items */
 static bool list_viewers(void)
 {
+#if ENABLED_PLUGINS
     int ret = filetype_list_viewers(selected_file);
     if (ret == PLUGIN_USB_CONNECTED)
         onplay_result = ONPLAY_RELOAD_DIR;
+#endif
     return false;
 }
 
 static bool onplay_load_plugin(void *param)
 {
+#if ENABLEDPLUGINS
     int ret = filetype_load_plugin((const char*)param, selected_file);
     if (ret == PLUGIN_USB_CONNECTED)
         onplay_result = ONPLAY_RELOAD_DIR;
+#endif
     return false;
 }
 
diff --git a/apps/plugin.c b/apps/plugin.c
index 28c5854..0eeb76d 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -70,6 +70,8 @@
 #undef HAVE_PLUGIN_CHECK_OPEN_CLOSE
 #endif
 
+#if ENABLEDPLUGINS
+
 #ifdef HAVE_PLUGIN_CHECK_OPEN_CLOSE
 static unsigned int open_files;
 #endif
@@ -989,3 +991,12 @@ static int creat_wrapper(const char *pathname, mode_t mode)
     return fd;
 }
 #endif /* HAVE_PLUGIN_CHECK_OPEN_CLOSE */
+#else
+
+void* plugin_get_buffer(size_t *buffer_size)
+{
+    *buffer_size = 0;
+    return NULL;
+}
+
+#endif /* ENABLEDPLUGINS */
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 0f2e38e..f147bbc 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -339,6 +339,7 @@ static int load_bmarks(void* param)
         return GO_TO_WPS;
     return GO_TO_PREVIOUS;
 }
+#if ENABLEDPLUGINS
 static int plugins_menu(void* param)
 {
     (void)param;
@@ -369,6 +370,8 @@ static int plugins_menu(void* param)
     }
     return retval;
 }
+#endif /* ENABLEDPLUGINS */
+
 int time_screen(void* ignored);     
 
 /* These are all static const'd from apps/menus/ *.c
@@ -400,7 +403,9 @@ static const struct root_items items[] = {
 #endif
     
     [GO_TO_RECENTBMARKS] =  { load_bmarks, NULL, &bookmark_settings_menu }, 
+#if ENABLEDPLUGINS
     [GO_TO_BROWSEPLUGINS] = { plugins_menu, NULL, NULL },
+#endif
     [GO_TO_PLAYLIST_VIEWER] = { playlist_view, NULL, NULL },
     
 };
@@ -414,8 +419,10 @@ MENUITEM_RETURNVALUE(file_browser, ID2P(LANG_DIR_BROWSER), GO_TO_FILEBROWSER,
 MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER, 
                         NULL, Icon_Audio);
 #endif
+#if ENABLEDPLUGINS
 MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS, 
                         NULL, Icon_Plugin);
+#endif
 static char *get_wps_item_name(int selected_item, void * data, char *buffer)
 {
     (void)selected_item; (void)data; (void)buffer;
@@ -465,7 +472,11 @@ MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE),
 #if CONFIG_TUNER
             &fm,
 #endif
-            &playlist_options, &rocks_browser,  &info_menu
+            &playlist_options,
+#if ENABLEDPLUGINS
+            &rocks_browser,
+#endif
+            &info_menu
 
 #ifdef HAVE_LCD_CHARCELLS
             ,&do_shutdown_item
@@ -549,6 +560,7 @@ static int load_context_screen(int selection)
         return GO_TO_PREVIOUS;
 }
 
+#if ENABLEDPLUGINS
 #ifdef HAVE_PICTUREFLOW_INTEGRATION
 static int load_plugin_screen(char *plug_path)
 {
@@ -576,6 +588,7 @@ static int load_plugin_screen(char *plug_path)
     return ret_val;
 }
 #endif
+#endif
 
 static int previous_music = GO_TO_WPS;
 
diff --git a/apps/tree.c b/apps/tree.c
index 730c59f..fb1ba30 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -418,6 +418,7 @@ static int update_dir(void)
 #endif
     {
 #ifdef HAVE_LCD_BITMAP
+#if ENABLEDPLUGINS
         if (global_settings.show_path_in_browser && 
             *(tc.dirfilter) == SHOW_PLUGINS)
         {
@@ -431,7 +432,9 @@ static int update_dir(void)
             else title = str(LANG_PLUGINS);
             gui_synclist_set_title(&tree_lists, title, Icon_Plugin);
         }
-        else if (global_settings.show_path_in_browser == SHOW_PATH_FULL)
+        else
+#endif
+        if (global_settings.show_path_in_browser == SHOW_PATH_FULL)
         {
             gui_synclist_set_title(&tree_lists, tc.currdir,
                 filetype_get_icon(ATTR_DIRECTORY));
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 8892600..792d160 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -671,7 +671,7 @@ Lyre prototype 1 */
 #endif
 #endif
 
-#if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP)
+#if defined(HAVE_TAGCACHE) && defined(HAVE_LCD_BITMAP) && ENABLEDPLUGINS
 #define HAVE_PICTUREFLOW_INTEGRATION
 #endif
 
diff --git a/tools/configure b/tools/configure
index e716439..fcabe28 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1155,7 +1155,7 @@ fi
     appextra="player:gui"
     archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
 
     # toolset is the tools within the tools directory that we build for
@@ -1183,7 +1183,7 @@ fi
     appextra="recorder:gui:radio"
     #archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1205,7 +1205,7 @@ fi
     appextra="recorder:gui:radio"
     #archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1227,7 +1227,7 @@ fi
     appextra="recorder:gui:radio"
     #archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1249,7 +1249,7 @@ fi
     appextra="recorder:gui:radio"
     #archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1271,7 +1271,7 @@ fi
     appextra="recorder:gui:radio"
     #archosrom="$pwd/rombox.ucl"
     flash="$pwd/rockbox.ucl"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     toolset=$archosbitmaptools
     t_cpu="sh"
@@ -1290,7 +1290,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="cjbm.ajz"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec=""
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1316,7 +1316,7 @@ fi
     bootoutput="bootloader.iriver"
     appextra="recorder:gui:radio"
     flash="$pwd/rombox.iriver"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1339,7 +1339,7 @@ fi
     bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.iriver"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1364,7 +1364,7 @@ fi
     bootoutput="bootloader.iriver"
     appextra="recorder:gui:radio"
     flash="$pwd/rombox.iriver"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1385,7 +1385,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.wma"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1406,7 +1406,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL"
     bootoutput="H10_20GC.mi4"
@@ -1430,7 +1430,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL"
     bootoutput="H10.mi4"
@@ -1454,7 +1454,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1477,7 +1477,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1500,7 +1500,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1523,7 +1523,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1546,7 +1546,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1569,7 +1569,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1592,7 +1592,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1615,7 +1615,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1638,7 +1638,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.ipod"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="bootloader-$modelname.ipod"
     # toolset is the tools within the tools directory that we build for
@@ -1665,7 +1665,7 @@ fi
     output="rockbox.iaudio"
     bootoutput="x5_fw.bin"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1691,7 +1691,7 @@ fi
     output="rockbox.iaudio"
     bootoutput="m5_fw.bin"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1714,7 +1714,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.iaudio"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     bootoutput="I7_FW.BIN"
     # toolset is the tools within the tools directory that we build for
@@ -1739,7 +1739,7 @@ fi
     output="rockbox.d2"
     bootoutput="bootloader-cowond2.bin"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset="$tccbitmaptools"
     # architecture, manufacturer and model for the target-tree build
@@ -1761,7 +1761,7 @@ fi
     output="rockbox.iaudio"
     bootoutput="cowon_m3.bin"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1783,7 +1783,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.gigabeat"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$gigabeatbitmaptools
     boottool="$rootdir/tools/scramble -gigabeat"
@@ -1805,7 +1805,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.gigabeat"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset="$gigabeatbitmaptools"
     boottool="$rootdir/tools/scramble -gigabeats"
@@ -1829,7 +1829,7 @@ fi
     bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.mrobe500"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$gigabeatbitmaptools
     boottool="cp "
@@ -1853,7 +1853,7 @@ fi
     bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=m100 -type=RBBL"
     bootoutput="pp5020.mi4"
@@ -1879,7 +1879,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.logik"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -1902,7 +1902,7 @@ fi
     USE_ELF="yes"
     output="rockbox.zvm"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$ipodbitmaptools
     boottool="$rootdir/tools/scramble -creative=zvm -no-ciff"
@@ -1925,7 +1925,7 @@ fi
     USE_ELF="yes"
     output="rockbox.zvm60"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$ipodbitmaptools
     boottool="$rootdir/tools/scramble -creative=zvm60"
@@ -1948,7 +1948,7 @@ fi
     USE_ELF="yes"
     output="rockbox.zv"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     toolset=$ipodbitmaptools
     boottool="$rootdir/tools/scramble -creative=zenvision"
@@ -1970,7 +1970,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=e200 -type=RBBL"
     bootoutput="PP5022.mi4"
@@ -1997,7 +1997,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4r -model=e20r -type=RBBL"
     bootoutput="pp5022.mi4"
@@ -2021,7 +2021,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=c200 -type=RBBL"
     bootoutput="firmware.mi4"
@@ -2047,7 +2047,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
     output="rockbox.m200"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -2071,7 +2071,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.c100"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -2093,7 +2093,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-clip.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2116,7 +2116,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-e200v2.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2137,7 +2137,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-m200v4.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2160,7 +2160,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-fuze.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2181,7 +2181,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-c200v2.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -2206,7 +2206,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-clipv2.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2227,7 +2227,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="gui"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=view -type=RBBL"
     bootoutput="firmware.mi4"
@@ -2250,7 +2250,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-clipplus.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2270,7 +2270,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-fuzev2.sansa"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"
@@ -2290,7 +2290,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.elio"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2"
     bootoutput="pp5020.mi4"
@@ -2314,7 +2314,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=9200 -type=RBBL"
     bootoutput="FWImage.ebn"
@@ -2338,7 +2338,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=1630 -type=RBBL"
     bootoutput="FWImage.ebn"
@@ -2362,7 +2362,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=6330 -type=RBBL"
     bootoutput="FWImage.ebn"
@@ -2386,7 +2386,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.meizu"
     appextra="recorder:gui:radio"
-    plugins="no" #FIXME
+    plugins="0"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="cp"
@@ -2408,7 +2408,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.meizu"
     appextra="recorder:gui:radio"
-    plugins="no" #FIXME
+    plugins="0"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="cp"
@@ -2430,7 +2430,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.meizu"
     appextra="recorder:gui:radio"
-    plugins="no" #FIXME
+    plugins="0"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="cp"
@@ -2452,7 +2452,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.vx747"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="$rootdir/tools/scramble -ccpmp"
@@ -2474,7 +2474,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.vx767"
     appextra="recorder:gui:radio"
-    plugins="" #FIXME
+    plugins="0" #FIXME
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="$rootdir/tools/scramble -ccpmp"
@@ -2496,7 +2496,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.vx747p"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="$rootdir/tools/scramble -ccpmp"
@@ -2518,7 +2518,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.vx777"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="$rootdir/tools/scramble -ccpmp"
@@ -2540,7 +2540,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.lyre"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     toolset=$scramblebitmaptools
     boottool="cp"
@@ -2562,7 +2562,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mini2440"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     toolset=$scramblebitmaptools
     boottool="cp"
@@ -2584,7 +2584,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=y820 -type=RBBL"
     bootoutput="FW_YH820.mi4"
@@ -2608,7 +2608,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 2"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=y920 -type=RBBL"
     bootoutput="PP5020.mi4"
@@ -2632,7 +2632,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v2 -model=y925 -type=RBBL"
     bootoutput="FW_YH925.mi4"
@@ -2656,7 +2656,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.yps3"
     appextra="recorder:gui:radio"
-    plugins="no" #FIXME
+    plugins="0"
     swcodec="yes"
     toolset=$genericbitmaptools
     boottool="cp"
@@ -2678,7 +2678,7 @@ fi
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
     output="rockbox.mi4"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     boottool="$rootdir/tools/scramble -mi4v3 -model=v500 -type=RBBL"
     bootoutput="jukebox.mi4"
@@ -2703,7 +2703,7 @@ fi
     output="rockbox.mpio"
     bootoutput="bootloader.mpio"
     appextra="recorder:gui:radio"
-    plugins="yes"
+    plugins="1"
     swcodec="yes"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
@@ -2731,7 +2731,7 @@ fi
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="0"
     swcodec="yes"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="hosted"
diff --git a/tools/root.make b/tools/root.make
index 401599a..d34806b 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -92,7 +92,7 @@ else
     include $(APPSDIR)/codecs/codecs.make
   endif
 
-  ifdef ENABLEDPLUGINS
+  ifeq ($(ENABLEDPLUGINS), 1)
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
   endif
-- 
1.7.3.1
Received on 2010-10-04

Page was last modified "Jan 10 2012" The Rockbox Crew
aaa