1
0
Fork 0
forked from len0rd/rockbox

Make the simulator builds acknowledge the plugins variable set in the configure

script.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5464 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2004-11-24 16:45:08 +00:00
parent 73d3b18ef6
commit c9d41b4b94
3 changed files with 8 additions and 6 deletions

2
tools/configure vendored
View file

@ -74,6 +74,7 @@ sed > Makefile \
-e "s,@PWD@,${pwd},g" \ -e "s,@PWD@,${pwd},g" \
-e "s,@LANGUAGE@,${language},g" \ -e "s,@LANGUAGE@,${language},g" \
-e "s,@TARGET@,${target},g" \ -e "s,@TARGET@,${target},g" \
-e "s,@PLUGINS@,${plugins},g" \
-e "s,@SIMVER@,${simver},g" \ -e "s,@SIMVER@,${simver},g" \
<<EOF <<EOF
## Automaticly generated. http://rockbox.haxx.se ## Automaticly generated. http://rockbox.haxx.se
@ -93,6 +94,7 @@ export SIMVER=@SIMVER@
export TARGET=@TARGET@ export TARGET=@TARGET@
export LANGUAGE=@LANGUAGE@ export LANGUAGE=@LANGUAGE@
export VERSION=\$(shell date +%y%m%d-%H%M) export VERSION=\$(shell date +%y%m%d-%H%M)
export ENABLEDPLUGINS=@PLUGINS@
.PHONY: .PHONY:

View file

@ -125,9 +125,9 @@ SRCS = button.c lcd-win32.c panic-win32.c thread-win32.c \
OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o
ifneq ($(ISONDIO),ONDIO) ifdef ENABLEDPLUGINS
ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c))
PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c))
endif endif
all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS)

View file

@ -135,9 +135,9 @@ SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o)
ifneq ($(ISONDIO),ONDIO) ifdef ENABLEDPLUGINS
ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c))
PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c))
endif endif
all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS)