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 /apps/codecs/Makefile | |
| parent | 4872825ed2c71e8bb2520681035355b24759d442 (diff) | |
| download | rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.tar.gz rockbox-c8f15f0857689b2d6e64f38c88c6885a61a4577d.zip | |
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/Makefile')
| -rw-r--r-- | apps/codecs/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index c93b59b8f4..a6e25d82b3 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
| @@ -76,7 +76,7 @@ ifeq ($(SIMVER), x11) | |||
| 76 | ################################################### | 76 | ################################################### |
| 77 | # This is the X11 simulator version | 77 | # This is the X11 simulator version |
| 78 | 78 | ||
| 79 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 79 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
| 80 | @echo "LD $(notdir $@)" | 80 | @echo "LD $(notdir $@)" |
| 81 | $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 81 | $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
| 82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
| @@ -92,8 +92,8 @@ ifeq ($(SIMVER), sdl) | |||
| 92 | ################################################### | 92 | ################################################### |
| 93 | # This is the SDL simulator version | 93 | # This is the SDL simulator version |
| 94 | 94 | ||
| 95 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 95 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
| 96 | @echo "LD "`basename $@` | 96 | @echo "LD $(notdir $@)" |
| 97 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 97 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
| 98 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 98 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
| 99 | # 'x' must be kept or you'll have "Win32 error 5" | 99 | # 'x' must be kept or you'll have "Win32 error 5" |
| @@ -109,7 +109,7 @@ else # end of sdl-simulator | |||
| 109 | DLLTOOLFLAGS = --export-all | 109 | DLLTOOLFLAGS = --export-all |
| 110 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 110 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
| 111 | 111 | ||
| 112 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 112 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
| 113 | @echo "DLL $(notdir $@)" | 113 | @echo "DLL $(notdir $@)" |
| 114 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 114 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
| 115 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ | 115 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ |