diff options
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 9 |
1 files changed, 2 insertions, 7 deletions
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 |