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 \ | |||
74 | -e "s,@PWD@,${pwd},g" \ | 74 | -e "s,@PWD@,${pwd},g" \ |
75 | -e "s,@LANGUAGE@,${language},g" \ | 75 | -e "s,@LANGUAGE@,${language},g" \ |
76 | -e "s,@TARGET@,${target},g" \ | 76 | -e "s,@TARGET@,${target},g" \ |
77 | -e "s,@PLUGINS@,${plugins},g" \ | ||
77 | -e "s,@SIMVER@,${simver},g" \ | 78 | -e "s,@SIMVER@,${simver},g" \ |
78 | <<EOF | 79 | <<EOF |
79 | ## Automaticly generated. http://rockbox.haxx.se | 80 | ## Automaticly generated. http://rockbox.haxx.se |
@@ -93,6 +94,7 @@ export SIMVER=@SIMVER@ | |||
93 | export TARGET=@TARGET@ | 94 | export TARGET=@TARGET@ |
94 | export LANGUAGE=@LANGUAGE@ | 95 | export LANGUAGE=@LANGUAGE@ |
95 | export VERSION=\$(shell date +%y%m%d-%H%M) | 96 | export VERSION=\$(shell date +%y%m%d-%H%M) |
97 | export ENABLEDPLUGINS=@PLUGINS@ | ||
96 | 98 | ||
97 | .PHONY: | 99 | .PHONY: |
98 | 100 | ||
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 \ | |||
125 | 125 | ||
126 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o | 126 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o |
127 | 127 | ||
128 | ifneq ($(ISONDIO),ONDIO) | 128 | ifdef ENABLEDPLUGINS |
129 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) | 129 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) |
130 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) | 130 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) |
131 | endif | 131 | endif |
132 | 132 | ||
133 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) | 133 | 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 \ | |||
135 | 135 | ||
136 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) | 136 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) |
137 | 137 | ||
138 | ifneq ($(ISONDIO),ONDIO) | 138 | ifdef ENABLEDPLUGINS |
139 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) | 139 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) |
140 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) | 140 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) |
141 | endif | 141 | endif |
142 | 142 | ||
143 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) | 143 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) |