summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-06-15 05:41:41 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-06-15 05:41:41 +0000
commit5b9c4c12974adedbdf8cafd151716eb82d6f26be (patch)
treee2ca62a89a59b9041f3e5822d54f83d82993f944 /uisimulator
parent56e6335e8f95ec1ea043b94e72e3e5a0b5a07db9 (diff)
downloadrockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.gz
rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.bz2
rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.zip
The plugin lib now works in the win32 simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4747 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/win32/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index 402b9addd5..59949b951c 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -128,7 +128,10 @@ all: $(TOOLSDIR)/convbdf $(TARGET) $(ROCKS)
$(TOOLSDIR)/convbdf:
$(MAKE) -C $(TOOLSDIR)
-$(TARGET): $(OBJS)
+$(OBJDIR)/libplugin.a:
+ $(MAKE) -C $(PLUGINDIR)/lib DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" SIMULATOR=1
+
+$(TARGET): $(OBJS) $(OBJDIR)/libplugin.a
$(CC) $(OBJS) -o $(TARGET) $(LDFLAGS)
$(OBJDIR)/uisw32-res.o: uisw32.rc
@@ -140,6 +143,7 @@ clean:
$(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \
$(OBJDIR)/credits.raw
$(RM) -r $(DEPS)
+ $(MAKE) -C $(PLUGINDIR)/lib clean
distclean: clean
$(RM) config.cache
@@ -324,7 +328,7 @@ $(OBJDIR)/%.po : $(PLUGINDIR)/%.c
$(OBJDIR)/%.rock : $(OBJDIR)/%.po
$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
- $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@
+ $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@
DEPS:=$(OBJDIR)/.deps