diff options
Diffstat (limited to 'apps/Makefile')
-rw-r--r-- | apps/Makefile | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/apps/Makefile b/apps/Makefile index 1708727273..649dd48496 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -20,6 +20,12 @@ endif | |||
20 | 20 | ||
21 | ifdef SOFTWARECODECS | 21 | ifdef SOFTWARECODECS |
22 | CODECS=build-codecs | 22 | CODECS=build-codecs |
23 | |||
24 | # This sets up the parameters for building and linking libspeex for core voice | ||
25 | VOICE=libspeex-rockbox | ||
26 | VOICELIB=$(BUILDDIR)/libspeex-rockbox.a | ||
27 | LINKVOICE= -lspeex-rockbox | ||
28 | |||
23 | endif | 29 | endif |
24 | 30 | ||
25 | # Set up the bitmap libraries | 31 | # Set up the bitmap libraries |
@@ -92,6 +98,10 @@ dep: $(DEPFILE) | |||
92 | 98 | ||
93 | features: $(OBJDIR)/features | 99 | features: $(OBJDIR)/features |
94 | 100 | ||
101 | libspeex-rockbox: | ||
102 | $(SILENT)mkdir -p $(OBJDIR)/libspeex-rockbox | ||
103 | $(call PRINTS,MAKE in libspeex for rockbox core)$(MAKE) -C $(APPSDIR)/codecs/libspeex ROCKBOX_VOICE_CODEC=1 OBJDIR=$(OBJDIR)/libspeex-rockbox OUTPUT=$(BUILDDIR)/libspeex-rockbox.a | ||
104 | |||
95 | build-codecs: | 105 | build-codecs: |
96 | $(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib | 106 | $(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib |
97 | $(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs | 107 | $(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs |
@@ -126,13 +136,13 @@ $(MAXOUTFILE): | |||
126 | $(SILENT)cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) | 136 | $(SILENT)cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) |
127 | $(SILENT)rm $(MAXINFILE) | 137 | $(SILENT)rm $(MAXINFILE) |
128 | 138 | ||
129 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) | 139 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) |
130 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map | 140 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKVOICE) $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map |
131 | 141 | ||
132 | ifndef SIMVER | 142 | ifndef SIMVER |
133 | 143 | ||
134 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) | 144 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) |
135 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map | 145 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKVOICE) $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map |
136 | 146 | ||
137 | $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf | 147 | $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf |
138 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ | 148 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
@@ -177,8 +187,8 @@ else | |||
177 | endif | 187 | endif |
178 | 188 | ||
179 | $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ | 189 | $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ |
180 | $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(BITMAPLIBS) | 190 | $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) |
181 | $(call PRINTS,LD $(BINARY))$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) $(SIMULATOR_MAP) | 191 | $(call PRINTS,LD $(BINARY))$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKVOICE) $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) $(SIMULATOR_MAP) |
182 | endif | 192 | endif |
183 | 193 | ||
184 | $(BUILDDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin | 194 | $(BUILDDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin |