diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-04-28 18:01:29 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-04-28 18:01:29 +0000 |
| commit | 6752d1310d2ad37018c8b78614a2496d43c49301 (patch) | |
| tree | 67088905dad1ced168a3bffa0a9f855ce2789dea /apps | |
| parent | a40a3152bc87069abdaf4f789e50837a468ce18b (diff) | |
| download | rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.zip rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.tar.gz rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.tar.bz2 rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.tar.xz | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/Makefile | 9 | ||||
| -rw-r--r-- | apps/plugins/searchengine/Makefile | 13 | ||||
| -rw-r--r-- | apps/plugins/searchengine/searchengine.h | 7 |
3 files changed, 17 insertions, 12 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 8361727..39bf3c0 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 1ecd128..e6e980b 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 752e9ad..d89c9c2 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; |