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)