diff options
author | Dave Chapman <dave@dchapman.com> | 2006-01-22 22:08:05 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-01-22 22:08:05 +0000 |
commit | 19c0664d3b7e46825f5485dd33bcb98562d50331 (patch) | |
tree | a0a0d0d903bc9417fa266c066f4cd99842dd02fc | |
parent | e61935932f08a48c1de0f6c33b00018ed18d6068 (diff) | |
download | rockbox-19c0664d3b7e46825f5485dd33bcb98562d50331.tar.gz rockbox-19c0664d3b7e46825f5485dd33bcb98562d50331.zip |
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
-rw-r--r-- | apps/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
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 | |||
57 | ifdef SIMVER | 57 | ifdef SIMVER |
58 | # this is a sim build | 58 | # this is a sim build |
59 | 59 | ||
60 | all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) | 60 | all: $(BITMAPLIBS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) |
61 | 61 | ||
62 | else | 62 | else |
63 | # regular target build | 63 | # regular target build |
@@ -166,7 +166,7 @@ endif | |||
166 | $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ | 166 | $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ |
167 | $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) | 167 | $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) |
168 | @echo "LD $(BINARY)" | 168 | @echo "LD $(BINARY)" |
169 | $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map | 169 | $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map |
170 | 170 | ||
171 | endif | 171 | endif |
172 | 172 | ||
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 | |||
59 | 59 | ||
60 | 60 | ||
61 | .PHONY: $(SUBDIRS) | 61 | .PHONY: $(SUBDIRS) |
62 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 62 | all: $(BITMAPLIBS) $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
63 | 63 | ||
64 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS | 64 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
65 | @echo "create credits.raw" | 65 | @echo "create credits.raw" |