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 | |
parent | a40a3152bc87069abdaf4f789e50837a468ce18b (diff) | |
download | rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.tar.gz rockbox-6752d1310d2ad37018c8b78614a2496d43c49301.zip |
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
-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 83617278d5..39bf3c011b 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -35,11 +35,18 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | |||
35 | DEFS := $(SRC:%.c=$(OBJDIR)/%.def) | 35 | DEFS := $(SRC:%.c=$(OBJDIR)/%.def) |
36 | DIRS = . | 36 | DIRS = . |
37 | 37 | ||
38 | ####################################### | ||
39 | # Subdirs containing multi-file plugins | ||
40 | |||
41 | #for all targets | ||
42 | SUBDIRS += searchengine | ||
43 | |||
38 | #for any recorder and iRiver model | 44 | #for any recorder and iRiver model |
39 | ifneq (,$(strip $(foreach tgt,RECORDER IRIVER,$(findstring $(tgt),$(TARGET))))) | 45 | ifneq (,$(strip $(foreach tgt,RECORDER IRIVER,$(findstring $(tgt),$(TARGET))))) |
40 | SUBDIRS += rockboy searchengine | 46 | SUBDIRS += rockboy |
41 | endif | 47 | endif |
42 | 48 | ||
49 | |||
43 | .PHONY: $(SUBDIRS) | 50 | .PHONY: $(SUBDIRS) |
44 | all: $(OBJDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 51 | all: $(OBJDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
45 | 52 | ||
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) | |||
24 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 24 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
25 | DIRS = . | 25 | DIRS = . |
26 | 26 | ||
27 | 27 | LDS := ../plugin.lds | |
28 | ifndef SIMVER | 28 | OUTPUT = $(OUTDIR)/searchengine.rock |
29 | ifneq (,$(findstring RECORDER,$(TARGET))) ## Archos recorder targets | ||
30 | OUTPUT = $(OUTDIR)/searchengine.rock | ||
31 | else ## iRiver target | ||
32 | LDS := ../plugin.lds | ||
33 | OUTPUT = $(OUTDIR)/searchengine.rock | ||
34 | endif | ||
35 | else ## simulators | ||
36 | OUTPUT = $(OUTDIR)/searchengine.rock | ||
37 | endif | ||
38 | 29 | ||
39 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
40 | 31 | ||
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 @@ | |||
23 | #include <autoconf.h> | 23 | #include <autoconf.h> |
24 | 24 | ||
25 | extern int w, h, y; | 25 | extern int w, h, y; |
26 | #ifdef HAVE_LCD_BITMAP | ||
26 | #define PUTS(str) do { \ | 27 | #define PUTS(str) do { \ |
27 | rb->lcd_putsxy(1, y, str); \ | 28 | rb->lcd_putsxy(1, y, str); \ |
28 | rb->lcd_getstringsize(str, &w, &h); \ | 29 | rb->lcd_getstringsize(str, &w, &h); \ |
29 | y += h + 1; \ | 30 | y += h + 1; \ |
30 | } while (0); \ | 31 | } while (0); \ |
31 | rb->lcd_update() | 32 | rb->lcd_update() |
33 | #else | ||
34 | #define PUTS(str) do { \ | ||
35 | rb->lcd_puts(0, y, str); \ | ||
36 | y = (y + 1) % 2; \ | ||
37 | } while (0); | ||
38 | #endif | ||
32 | 39 | ||
33 | extern struct plugin_api* rb; | 40 | extern struct plugin_api* rb; |
34 | 41 | ||