From 19c0664d3b7e46825f5485dd33bcb98562d50331 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 22 Jan 2006 22:08:05 +0000 Subject: Fix sim builds broken by the bmp2rb-in-build-system patch git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8420 a1c6a512-1295-4272-9138-f99709370657 --- apps/Makefile | 4 ++-- apps/plugins/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/Makefile b/apps/Makefile index 2c5641ec7f..3f106d10f6 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -57,7 +57,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a ifdef SIMVER # this is a sim build -all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) +all: $(BITMAPLIBS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) else # regular target build @@ -166,7 +166,7 @@ endif $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) @echo "LD $(BINARY)" - $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map + $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map endif diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 19c3307be6..04bb62fbe3 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -59,7 +59,7 @@ endif .PHONY: $(SUBDIRS) -all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) +all: $(BITMAPLIBS) $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS @echo "create credits.raw" -- cgit v1.2.3