8 files changed, 12 insertions, 28 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index d982ecb4c3..6257a222bd 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,10 +1,8 @@
 /* plugins common to all models */
-battery_bench.c
 chessclock.c
 credits.c
 cube.c
 dict.c
-firmware_flash.c
 jackpot.c
 keybox.c
 logo.c
@@ -12,7 +10,6 @@ mosaique.c
 properties.c
 random_folder_advance_config.c
 rockblox.c
-rockbox_flash.c
 search.c
 settings_dumper.c
 snow.c
@@ -24,6 +21,13 @@ viewer.c
 #ifdef HAVE_BACKLIGHT
 lamp.c
 #endif /* HAVE_BACKLIGHT */
+#ifndef SIMULATOR
+battery_bench.c
+firmware_flash.c
+#endif /* SIMULATOR */
+#if (CONFIG_CPU == SH7034)
+rockbox_flash.c
+#endif /* CONFIG_CPU */
 
 #ifndef OLYMPUS_MROBE_500
 
@@ -84,7 +88,8 @@ solitaire.c
 sokoban.c
 star.c
 starfield.c
-#if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC)
+#if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC) && \
+    !defined(SIMULATOR)
 video.c
 #endif
 vu_meter.c
@@ -128,7 +133,9 @@ wav2wv.c
     /* not for Ondio, has no remote control pin */
 alpine_cdc.c
 #endif
+#if defined(HAVE_LCD_BITMAP) && !defined(SIMULATOR)
 splitedit.c
+#endif
 #endif /* CONFIG_CODEC */
 
 #if LCD_DEPTH > 1                  /* non-mono bitmap targets */
@@ -139,7 +146,7 @@ matrix.c
 #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
 iriverify.c
 #endif
-#if defined(IRIVER_H100_SERIES)
+#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
 iriver_flash.c
 #endif
 
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index f87886a2b9..40b9998dcb 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#ifndef SIMULATOR /* not for the simulator */
 
 #include "version.h"
 #include "plugin.h"
@@ -560,5 +559,3 @@ int main(void)
     
     return PLUGIN_OK;
 }
-
-#endif /* SIMULATOR */
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index ecd40f687b..f18fccebb4 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -21,9 +21,6 @@
  ****************************************************************************/
 #include "plugin.h"
 
-/* Only build for (correct) target */
-#ifdef HAVE_LCD_BITMAP 
-
 PLUGIN_HEADER
 
 #define EXTERN static
@@ -1456,4 +1453,3 @@ enum plugin_status plugin_start(const void* parameter)
     else
         return PLUGIN_ERROR;
 }
-#endif /* #ifdef HAVE_LCD_BITMAP */
diff --git a/apps/plugins/firmware_flash.c b/apps/plugins/firmware_flash.c
index c855fb669f..ebf4242e2a 100644
--- a/apps/plugins/firmware_flash.c
+++ b/apps/plugins/firmware_flash.c
@@ -23,8 +23,6 @@
 ****************************************************************************/
 #include "plugin.h"
 
-#ifndef SIMULATOR /* only for target */
-
 /* define DUMMY if you only want to "play" with the UI, does no harm */
 /* #define DUMMY */
 
@@ -1085,4 +1083,3 @@ enum plugin_status plugin_start(const void* parameter)
 }
 
 #endif /* ifdef PLATFORM_ID */
-#endif /* #ifndef SIMULATOR */
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index b2273f1b86..0b3833b9cf 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -24,8 +24,6 @@
 
 /* All CFI flash routines are copied and ported from firmware_flash.c */
 
-#ifndef SIMULATOR /* only for target */
-
 unsigned char *audiobuf;
 ssize_t audiobuf_size;
 
@@ -815,4 +813,3 @@ enum plugin_status plugin_start(const void* parameter)
 }
 
 #endif /* ifdef PLATFORM_ID */
-#endif /* #ifndef SIMULATOR */
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index 28b4de8909..81a8b2416a 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -21,9 +21,6 @@
 
 #include "plugin.h"
 
-#ifndef SIMULATOR
-#ifdef HAVE_LCD_BITMAP
-
 PLUGIN_HEADER
 
 /* variable button definitions */
@@ -1271,5 +1268,3 @@ enum plugin_status plugin_start(const void* parameter)
     }
     return splitedit_exit_code;
 }
-#endif
-#endif
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index bd2ddb5de6..bcbbb99d80 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -31,7 +31,6 @@
 #include "system.h"
 #include "lib/helper.h"
 
-#ifndef SIMULATOR /* not for simulator by now */
 #ifdef HAVE_LCD_BITMAP /* and definitely not for the Player, haha */
 
 PLUGIN_HEADER
@@ -1026,5 +1025,4 @@ enum plugin_status plugin_start(const void* parameter)
 }
 
 #endif /* #ifdef HAVE_LCD_BITMAP */
-#endif /* #ifndef SIMULATOR */
 
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 77d2924ebb..673c080102 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -20,8 +20,6 @@
 #include "plugin.h"
 #include "lib/fixedpoint.h"
 
-#if defined(HAVE_LCD_BITMAP)
-
 PLUGIN_HEADER
 
 /* variable button definitions */
@@ -822,4 +820,3 @@ enum plugin_status plugin_start(const void* parameter) {
             lastbutton = button;
     }
 }
-#endif /* #ifdef HAVE_LCD_BITMAP */