3 files changed, 17 insertions, 12 deletions

diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index 83617278d5..39bf3c011b 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -35,11 +35,18 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DEFS := $(SRC:%.c=$(OBJDIR)/%.def)
 DIRS = .
 
+#######################################
+# Subdirs containing multi-file plugins
+
+#for all targets
+SUBDIRS += searchengine
+
 #for any recorder and iRiver model
 ifneq (,$(strip $(foreach tgt,RECORDER IRIVER,$(findstring $(tgt),$(TARGET)))))
-    SUBDIRS += rockboy searchengine
+    SUBDIRS += rockboy
 endif
 
+
 .PHONY: $(SUBDIRS)
 all: $(OBJDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE)
 
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile
index 1ecd12803b..e6e980b7b0 100644
--- a/apps/plugins/searchengine/Makefile
+++ b/apps/plugins/searchengine/Makefile
@@ -24,17 +24,8 @@ SOURCES = $(SRC)
 OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 DIRS = .
 
-
-ifndef SIMVER
-ifneq (,$(findstring RECORDER,$(TARGET))) ## Archos recorder targets
-    OUTPUT = $(OUTDIR)/searchengine.rock
-else  ## iRiver target
-    LDS := ../plugin.lds
-    OUTPUT = $(OUTDIR)/searchengine.rock
-endif
-else  ## simulators
-    OUTPUT = $(OUTDIR)/searchengine.rock
-endif
+LDS := ../plugin.lds
+OUTPUT = $(OUTDIR)/searchengine.rock
 
 all: $(OUTPUT)
 
diff --git a/apps/plugins/searchengine/searchengine.h b/apps/plugins/searchengine/searchengine.h
index 752e9ad0e4..d89c9c2a0e 100644
--- a/apps/plugins/searchengine/searchengine.h
+++ b/apps/plugins/searchengine/searchengine.h
@@ -23,12 +23,19 @@
 #include <autoconf.h>
 
 extern int w, h, y;
+#ifdef HAVE_LCD_BITMAP
 #define PUTS(str) do { \
           rb->lcd_putsxy(1, y, str); \
           rb->lcd_getstringsize(str, &w, &h); \
           y += h + 1; \
 } while (0); \
 rb->lcd_update()
+#else
+#define PUTS(str) do { \
+          rb->lcd_puts(0, y, str); \
+          y = (y + 1) % 2; \
+} while (0);
+#endif
 
 extern struct plugin_api* rb;