diff options
| author | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 05:28:17 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 05:28:17 +0000 |
| commit | c8f15f0857689b2d6e64f38c88c6885a61a4577d (patch) | |
| tree | 6bce3af3d1d45d385fc5637d20de3c4ba072ba55 | |
| parent | 4872825ed2c71e8bb2520681035355b24759d442 (diff) | |
| download | rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.zip rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.tar.gz rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.tar.bz2 rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.tar.xz | |
Fix simulator builds (not positive sims are parallel make compliant still)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8639 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rw-r--r-- | apps/codecs/Makefile | 8 | ||||
| -rw-r--r-- | apps/plugins/Makefile | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile index 6b3f999..26f96a5 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -164,7 +164,7 @@ endif $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ - $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) + $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(BITMAPLIBS) @echo "LD $(BINARY)" $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index c93b59b..a6e25d8 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -76,7 +76,7 @@ ifeq ($(SIMVER), x11) ################################################### # This is the X11 simulator version -$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a +$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) @echo "LD $(notdir $@)" $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) @@ -92,8 +92,8 @@ ifeq ($(SIMVER), sdl) ################################################### # This is the SDL simulator version -$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a - @echo "LD "`basename $@` +$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) + @echo "LD $(notdir $@)" $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -109,7 +109,7 @@ else # end of sdl-simulator DLLTOOLFLAGS = --export-all DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin -$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a +$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) @echo "DLL $(notdir $@)" $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 67265a3..f7bd102 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -100,7 +100,7 @@ ifeq ($(SIMVER), x11) ################################################### # This is the X11 simulator version -$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a +$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) @echo "LD "`basename $@` $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) @@ -116,7 +116,7 @@ ifeq ($(SIMVER), sdl) ################################################### # This is the SDL simulator version -$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a +$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) @echo "LD "`basename $@` $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) @@ -133,7 +133,7 @@ else # end of sdl-simulator DLLTOOLFLAGS = --export-all DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin -$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a +$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) @echo "DLL "`basename $@` $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ |