From 6752d1310d2ad37018c8b78614a2496d43c49301 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Thu, 28 Apr 2005 18:01:29 +0000 Subject: Make searchengine compile for all targets; correct linking for archos. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6379 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/searchengine/Makefile | 13 ++----------- apps/plugins/searchengine/searchengine.h | 7 +++++++ 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'apps/plugins/searchengine') 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 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; -- cgit v1.2.3