diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-11-24 16:45:08 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-11-24 16:45:08 +0000 |
| commit | c9d41b4b94882ade8fa4b706948dd860652b0af0 (patch) | |
| tree | 97273084797063c9929ab90cc45f58134753207b | |
| parent | 73d3b18ef6c4cac965a72eb954fe71cdf89c4860 (diff) | |
| download | rockbox-c9d41b4b94882ade8fa4b706948dd860652b0af0.tar.gz rockbox-c9d41b4b94882ade8fa4b706948dd860652b0af0.zip | |
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
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | uisimulator/win32/Makefile | 6 | ||||
| -rw-r--r-- | uisimulator/x11/Makefile | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/tools/configure b/tools/configure index 78403814fb..7a1403cb6a 100755 --- a/tools/configure +++ b/tools/configure @@ -74,6 +74,7 @@ sed > Makefile \ -e "s,@PWD@,${pwd},g" \ -e "s,@LANGUAGE@,${language},g" \ -e "s,@TARGET@,${target},g" \ + -e "s,@PLUGINS@,${plugins},g" \ -e "s,@SIMVER@,${simver},g" \ <<EOF ## Automaticly generated. http://rockbox.haxx.se @@ -93,6 +94,7 @@ export SIMVER=@SIMVER@ export TARGET=@TARGET@ export LANGUAGE=@LANGUAGE@ export VERSION=\$(shell date +%y%m%d-%H%M) +export ENABLEDPLUGINS=@PLUGINS@ .PHONY: diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 22ce4d65d1..d04bf050ef 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile @@ -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 -ifneq ($(ISONDIO),ONDIO) -ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) -PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) +ifdef ENABLEDPLUGINS + ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) + PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) endif all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 683dca6b82..2c9d69d6a2 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -135,9 +135,9 @@ SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \ OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) -ifneq ($(ISONDIO),ONDIO) -ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) -PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) +ifdef ENABLEDPLUGINS + ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) + PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) endif all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) |