diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-15 05:41:41 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-15 05:41:41 +0000 |
commit | 5b9c4c12974adedbdf8cafd151716eb82d6f26be (patch) | |
tree | e2ca62a89a59b9041f3e5822d54f83d82993f944 /uisimulator/win32 | |
parent | 56e6335e8f95ec1ea043b94e72e3e5a0b5a07db9 (diff) | |
download | rockbox-5b9c4c12974adedbdf8cafd151716eb82d6f26be.tar.gz 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/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 8 |
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) | |||
128 | $(TOOLSDIR)/convbdf: | 128 | $(TOOLSDIR)/convbdf: |
129 | $(MAKE) -C $(TOOLSDIR) | 129 | $(MAKE) -C $(TOOLSDIR) |
130 | 130 | ||
131 | $(TARGET): $(OBJS) | 131 | $(OBJDIR)/libplugin.a: |
132 | $(MAKE) -C $(PLUGINDIR)/lib DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" SIMULATOR=1 | ||
133 | |||
134 | $(TARGET): $(OBJS) $(OBJDIR)/libplugin.a | ||
132 | $(CC) $(OBJS) -o $(TARGET) $(LDFLAGS) | 135 | $(CC) $(OBJS) -o $(TARGET) $(LDFLAGS) |
133 | 136 | ||
134 | $(OBJDIR)/uisw32-res.o: uisw32.rc | 137 | $(OBJDIR)/uisw32-res.o: uisw32.rc |
@@ -140,6 +143,7 @@ clean: | |||
140 | $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ | 143 | $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ |
141 | $(OBJDIR)/credits.raw | 144 | $(OBJDIR)/credits.raw |
142 | $(RM) -r $(DEPS) | 145 | $(RM) -r $(DEPS) |
146 | $(MAKE) -C $(PLUGINDIR)/lib clean | ||
143 | 147 | ||
144 | distclean: clean | 148 | distclean: clean |
145 | $(RM) config.cache | 149 | $(RM) config.cache |
@@ -324,7 +328,7 @@ $(OBJDIR)/%.po : $(PLUGINDIR)/%.c | |||
324 | 328 | ||
325 | $(OBJDIR)/%.rock : $(OBJDIR)/%.po | 329 | $(OBJDIR)/%.rock : $(OBJDIR)/%.po |
326 | $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 330 | $(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
327 | $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< -o $@ | 331 | $(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@ |
328 | 332 | ||
329 | DEPS:=$(OBJDIR)/.deps | 333 | DEPS:=$(OBJDIR)/.deps |
330 | 334 | ||