diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/buildzip.pl | 2 | ||||
-rwxr-xr-x | tools/codecscan.pl | 2 | ||||
-rwxr-xr-x | tools/configure | 1 | ||||
-rw-r--r-- | tools/rbspeex/Makefile | 2 | ||||
-rw-r--r-- | tools/root.make | 9 |
5 files changed, 6 insertions, 10 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 2aa990ac7d..82074016f3 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -486,7 +486,7 @@ STOP | |||
486 | # Android has codecs installed as native libraries so they are not needed | 486 | # Android has codecs installed as native libraries so they are not needed |
487 | # in the zip. | 487 | # in the zip. |
488 | if ($modelname !~ /android/) { | 488 | if ($modelname !~ /android/) { |
489 | find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'apps/codecs'); | 489 | find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'lib/rbcodec/codecs'); |
490 | } | 490 | } |
491 | 491 | ||
492 | # remove directory again if no codec was copied | 492 | # remove directory again if no codec was copied |
diff --git a/tools/codecscan.pl b/tools/codecscan.pl index c21295d49f..4f0cbc73af 100755 --- a/tools/codecscan.pl +++ b/tools/codecscan.pl | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/perl | 1 | #!/usr/bin/perl |
2 | 2 | ||
3 | $codecs="apps/codecs"; | 3 | $codecs="lib/rbcodec/codecs"; |
4 | 4 | ||
5 | opendir(DIR, $codecs) || die "can't opendir $some_dir: $!"; | 5 | opendir(DIR, $codecs) || die "can't opendir $some_dir: $!"; |
6 | my @maps = sort grep { /\.map/ && -f "$codecs/$_" } readdir(DIR); | 6 | my @maps = sort grep { /\.map/ && -f "$codecs/$_" } readdir(DIR); |
diff --git a/tools/configure b/tools/configure index 73639cfb5c..23731530d1 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -3849,6 +3849,7 @@ export CPU=${t_cpu} | |||
3849 | export MANUFACTURER=${t_manufacturer} | 3849 | export MANUFACTURER=${t_manufacturer} |
3850 | export OBJDIR=${pwd} | 3850 | export OBJDIR=${pwd} |
3851 | export BUILDDIR=${pwd} | 3851 | export BUILDDIR=${pwd} |
3852 | export RBCODEC_BLD=${pwd}/lib/rbcodec | ||
3852 | export LANGUAGE=${language} | 3853 | export LANGUAGE=${language} |
3853 | export VOICELANGUAGE=${voicelanguage} | 3854 | export VOICELANGUAGE=${voicelanguage} |
3854 | export MEMORYSIZE=${memory} | 3855 | export MEMORYSIZE=${memory} |
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 247d25e1db..2435caeaf4 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile | |||
@@ -11,7 +11,7 @@ ifndef V | |||
11 | SILENT = @ | 11 | SILENT = @ |
12 | endif | 12 | endif |
13 | 13 | ||
14 | SPEEXSRC = ../../apps/codecs/libspeex | 14 | SPEEXSRC = ../../lib/rbcodec/codecs/libspeex |
15 | 15 | ||
16 | INCLUDES = -I $(SPEEXSRC) | 16 | INCLUDES = -I $(SPEEXSRC) |
17 | SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER | 17 | SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER |
diff --git a/tools/root.make b/tools/root.make index 0fc6c55403..689047e9db 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -101,17 +101,12 @@ else ifneq (,$(findstring database,$(APP_TYPE))) | |||
101 | else ifneq (,$(findstring warble,$(APP_TYPE))) | 101 | else ifneq (,$(findstring warble,$(APP_TYPE))) |
102 | include $(ROOTDIR)/lib/rbcodec/test/warble.make | 102 | include $(ROOTDIR)/lib/rbcodec/test/warble.make |
103 | include $(ROOTDIR)/lib/tlsf/libtlsf.make | 103 | include $(ROOTDIR)/lib/tlsf/libtlsf.make |
104 | include $(APPSDIR)/codecs/codecs.make | ||
105 | include $(ROOTDIR)/lib/rbcodec/rbcodec.make | 104 | include $(ROOTDIR)/lib/rbcodec/rbcodec.make |
106 | else | 105 | else |
107 | include $(APPSDIR)/apps.make | 106 | include $(APPSDIR)/apps.make |
108 | include $(ROOTDIR)/lib/rbcodec/rbcodec.make | 107 | include $(ROOTDIR)/lib/rbcodec/rbcodec.make |
109 | include $(APPSDIR)/lang/lang.make | 108 | include $(APPSDIR)/lang/lang.make |
110 | 109 | ||
111 | ifdef SOFTWARECODECS | ||
112 | include $(APPSDIR)/codecs/codecs.make | ||
113 | endif | ||
114 | |||
115 | ifdef ENABLEDPLUGINS | 110 | ifdef ENABLEDPLUGINS |
116 | include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make | 111 | include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make |
117 | include $(APPSDIR)/plugins/plugins.make | 112 | include $(APPSDIR)/plugins/plugins.make |
@@ -206,7 +201,7 @@ $(LINKROM): $(ROMLDS) | |||
206 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM) | 201 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM) |
207 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 202 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
208 | -L$(BUILDDIR)/firmware -lfirmware \ | 203 | -L$(BUILDDIR)/firmware -lfirmware \ |
209 | -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ | 204 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ |
210 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ | 205 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ |
211 | -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \ | 206 | -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \ |
212 | -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map | 207 | -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map |
@@ -214,7 +209,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI | |||
214 | $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM) | 209 | $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM) |
215 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 210 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
216 | -L$(BUILDDIR)/firmware -lfirmware \ | 211 | -L$(BUILDDIR)/firmware -lfirmware \ |
217 | -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ | 212 | -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ |
218 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ | 213 | -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \ |
219 | -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \ | 214 | -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \ |
220 | -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map | 215 | -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map |