len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make searchengine compile for all targets; correct linking for archos.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6379 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-04-28 18:01:29 +00:00
parent a40a3152bc
commit 6752d1310d
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/plugins/Makefile
View file

@ -35,11 +35,18 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
DEFS := $(SRC:%.c=$(OBJDIR)/%.def) DEFS := $(SRC:%.c=$(OBJDIR)/%.def)
DIRS = . DIRS = .
#######################################
# Subdirs containing multi-file plugins
#for all targets
SUBDIRS += searchengine
#for any recorder and iRiver model #for any recorder and iRiver model
ifneq (,$(strip $(foreach tgt,RECORDER IRIVER,$(findstring $(tgt),$(TARGET))))) ifneq (,$(strip $(foreach tgt,RECORDER IRIVER,$(findstring $(tgt),$(TARGET)))))
SUBDIRS += rockboy searchengine SUBDIRS += rockboy
endif endif
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
all: $(OBJDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) all: $(OBJDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE)

13
apps/plugins/searchengine/Makefile
View file

@ -24,17 +24,8 @@ SOURCES = $(SRC)
OBJS := $(SRC:%.c=$(OBJDIR)/%.o) OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
DIRS = . DIRS = .
LDS := ../plugin.lds
ifndef SIMVER OUTPUT = $(OUTDIR)/searchengine.rock
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
all: $(OUTPUT) all: $(OUTPUT)

7
apps/plugins/searchengine/searchengine.h
View file

@ -23,12 +23,19 @@
#include <autoconf.h> #include <autoconf.h>
extern int w, h, y; extern int w, h, y;
#ifdef HAVE_LCD_BITMAP
#define PUTS(str) do { \ #define PUTS(str) do { \
rb->lcd_putsxy(1, y, str); \ rb->lcd_putsxy(1, y, str); \
rb->lcd_getstringsize(str, &w, &h); \ rb->lcd_getstringsize(str, &w, &h); \
y += h + 1; \ y += h + 1; \
} while (0); \ } while (0); \
rb->lcd_update() 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; extern struct plugin_api* rb;