From 22b7701fe75cce9afdbc27046821dc089f9e7dac Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 22 Feb 2005 12:19:12 +0000 Subject: Build cleanup and general fixes. fprintf() is now fdprintf(), the separation between uisimulator files and firmware/apps files are better done. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657 --- apps/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'apps/Makefile') diff --git a/apps/Makefile b/apps/Makefile index bcdc1ef265..4f80e045b7 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -43,6 +43,8 @@ MAXOUTFILE = $(OBJDIR)/romstart ifdef SIMVER # this is a sim build all: $(OBJDIR)/$(BINARY) $(CODECS) $(ROCKS) + @$(MAKE) -C $(SIMDIR) + @$(MAKE) -C $(ROOTDIR)/uisimulator/common else # regular target build all: $(OBJDIR)/$(BINARY) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) @@ -101,12 +103,22 @@ $(OBJDIR)/$(BINARY) : $(OBJDIR)/rockbox.bin else # this is a simulator build -$(OBJDIR)/$(BINARY) : $(OBJS) $(OBJDIR)/librockbox.a $(DEPFILE) $(OBJDIR)/libsim.a + +ifeq ($(SIMVER), win32) +# OK, this is ugly but we need it on the link line to make it do right +EXTRAOBJ = $(OBJDIR)/uisw32-res.o +endif + + +$(OBJDIR)/$(BINARY) : $(OBJS) $(OBJDIR)/librockbox.a $(DEPFILE) $(OBJDIR)/libsim.a $(OBJDIR)/libcomsim.a @echo "LD $(BINARY)" - $(CC) $(GCCOPTS) -o $@ $(OBJS) $(LDOPTS) -L$(OBJDIR) -lrockbox -lsim -Wl,-Map,$(OBJDIR)/rockbox.map + $(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(OBJDIR) -lrockbox -lsim -lcomsim $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map $(OBJDIR)/libsim.a: @$(MAKE) -C $(SIMDIR) + +$(OBJDIR)/libcomsim.a: + @$(MAKE) -C $(ROOTDIR)/uisimulator/common endif $(OBJDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin -- cgit v1.2.3