diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/Makefile | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index a6e25d82b3..e0d4e47f54 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -46,23 +46,22 @@ OUTPUT = $(SOFTWARECODECS) | |||
46 | all: $(ROCKS) | 46 | all: $(ROCKS) |
47 | 47 | ||
48 | ifndef SIMVER | 48 | ifndef SIMVER |
49 | NULL = | 49 | $(OBJDIR)/wav.elf : $(OBJDIR)/wav.o |
50 | 50 | $(OBJDIR)/aiff.elf : $(OBJDIR)/aiff.o | |
51 | $(OBJDIR)/wav.elf : $(NULL) | 51 | $(OBJDIR)/mpa.elf : $(OBJDIR)/mpa.o $(BUILDDIR)/libmad.a |
52 | $(OBJDIR)/aiff.elf : $(NULL) | 52 | $(OBJDIR)/a52.elf : $(OBJDIR)/a52.o $(BUILDDIR)/liba52.a |
53 | $(OBJDIR)/mpa.elf : $(BUILDDIR)/libmad.a | 53 | $(OBJDIR)/flac.elf : $(OBJDIR)/flac.o $(BUILDDIR)/libffmpegFLAC.a |
54 | $(OBJDIR)/a52.elf : $(BUILDDIR)/liba52.a | 54 | $(OBJDIR)/vorbis.elf : $(OBJDIR)/vorbis.o $(BUILDDIR)/libTremor.a |
55 | $(OBJDIR)/flac.elf : $(BUILDDIR)/libffmpegFLAC.a | 55 | $(OBJDIR)/mpc.elf : $(OBJDIR)/mpc.o $(BUILDDIR)/libmusepack.a |
56 | $(OBJDIR)/vorbis.elf : $(BUILDDIR)/libTremor.a | 56 | $(OBJDIR)/wavpack.elf : $(OBJDIR)/wavpack.o $(BUILDDIR)/libwavpack.a |
57 | $(OBJDIR)/mpc.elf : $(BUILDDIR)/libmusepack.a | 57 | $(OBJDIR)/alac.elf : $(OBJDIR)/alac.o $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a |
58 | $(OBJDIR)/wavpack.elf : $(BUILDDIR)/libwavpack.a | 58 | $(OBJDIR)/aac.elf : $(OBJDIR)/aac.o $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a |
59 | $(OBJDIR)/alac.elf : $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a | 59 | $(OBJDIR)/shorten.elf : $(OBJDIR)/shorten.o $(BUILDDIR)/libffmpegFLAC.a |
60 | $(OBJDIR)/aac.elf : $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a | ||
61 | $(OBJDIR)/shorten.elf : $(BUILDDIR)/libffmpegFLAC.a | ||
62 | 60 | ||
63 | $(OBJDIR)/%.elf : | 61 | $(OBJDIR)/%.elf : |
64 | @echo "LD $(notdir $@)" | 62 | @echo "LD $(notdir $@)" |
65 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map | 63 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec \ |
64 | -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map | ||
66 | 65 | ||
67 | $(BUILDDIR)/%.a : % $(CODECDEPS) | 66 | $(BUILDDIR)/%.a : % $(CODECDEPS) |
68 | 67 | ||
@@ -78,7 +77,7 @@ ifeq ($(SIMVER), x11) | |||
78 | 77 | ||
79 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 78 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
80 | @echo "LD $(notdir $@)" | 79 | @echo "LD $(notdir $@)" |
81 | $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 80 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 81 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
83 | # 'x' must be kept or you'll have "Win32 error 5" | 82 | # 'x' must be kept or you'll have "Win32 error 5" |
84 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 83 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -94,7 +93,7 @@ ifeq ($(SIMVER), sdl) | |||
94 | 93 | ||
95 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 94 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
96 | @echo "LD $(notdir $@)" | 95 | @echo "LD $(notdir $@)" |
97 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 96 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
98 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 97 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
99 | # 'x' must be kept or you'll have "Win32 error 5" | 98 | # 'x' must be kept or you'll have "Win32 error 5" |
100 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 99 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -112,8 +111,9 @@ DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | |||
112 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 111 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
113 | @echo "DLL $(notdir $@)" | 112 | @echo "DLL $(notdir $@)" |
114 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 113 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
115 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ | 114 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< \ |
116 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ | 115 | $(BUILDDIR)/libcodec.a $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) \ |
116 | -o $@ | ||
117 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 117 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
118 | # 'x' must be kept or you'll have "Win32 error 5" | 118 | # 'x' must be kept or you'll have "Win32 error 5" |
119 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 119 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |