summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-02-09 05:28:17 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-02-09 05:28:17 +0000
commitc8f15f0857689b2d6e64f38c88c6885a61a4577d (patch)
tree6bce3af3d1d45d385fc5637d20de3c4ba072ba55 /apps/codecs
parent4872825ed2c71e8bb2520681035355b24759d442 (diff)
downloadrockbox-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
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/Makefile8
1 files changed, 4 insertions, 4 deletions
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 \