diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-01-17 07:36:08 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-21 18:39:19 +0100 |
| commit | cf333a61c7861361b4025cb0f67c8f75b0b07eef (patch) | |
| tree | cecb037f3c38ecb035ff79de75dafa6b135bb595 /apps | |
| parent | 4343011955bffaf61b002a89b0137d48e873d9d0 (diff) | |
| download | rockbox-cf333a61c7861361b4025cb0f67c8f75b0b07eef.zip rockbox-cf333a61c7861361b4025cb0f67c8f75b0b07eef.tar.gz rockbox-cf333a61c7861361b4025cb0f67c8f75b0b07eef.tar.bz2 rockbox-cf333a61c7861361b4025cb0f67c8f75b0b07eef.tar.xz | |
Move supprt-arm.S to separate library.
Core, codecs and plugins link it separately so this gets rid of SOURCES trickery.
Don't build it for hosted targets.
Change-Id: If15ef90e93cd218a4352ae8e89eea95d3122452f
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/codecs.make | 2 | ||||
| -rw-r--r-- | apps/codecs/lib/SOURCES | 4 | ||||
| -rw-r--r-- | apps/plugins/imageviewer/imageviewer.make | 2 | ||||
| -rw-r--r-- | apps/plugins/lib/SOURCES | 1 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 4 |
5 files changed, 4 insertions, 9 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index d352579..e18b92c 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make @@ -201,7 +201,7 @@ $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECLIB $(CODECLIB) \ -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) -$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) +$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) $(LIBARMSUPPORT) $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ $(filter %.o, $^) \ $(filter %.a, $+) \ diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES index cd38dc1..257dcb5 100644 --- a/apps/codecs/lib/SOURCES +++ b/apps/codecs/lib/SOURCES @@ -7,10 +7,6 @@ mdct_lookup.c fft-ffmpeg.c mdct.c -#ifdef CPU_ARM -../../../firmware/target/arm/support-arm.S -#endif - #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) osx.dummy.c #endif diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make index d06bbfd..8f933e3 100644 --- a/apps/plugins/imageviewer/imageviewer.make +++ b/apps/plugins/imageviewer/imageviewer.make @@ -47,7 +47,7 @@ else endif # rule to create reference map for image decoder -$(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) +$(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(LIBARMSUPPORT) $(PLUGINBITMAPLIB) $(call PRINTS,LD $(@F))$(CC) $(IMGDECFLAGS) -o /dev/null \ $(filter %.o, $^) \ $(filter %.a, $+) \ diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index 2c0fc2a..4b33901 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -41,7 +41,6 @@ playergfx.c #ifdef HAVE_LCD_BITMAP #ifdef CPU_ARM -../../../firmware/target/arm/support-arm.S pluginlib_jpeg_idct_arm.S #endif diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index fca37aa..1bf78d8 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -65,7 +65,7 @@ PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) $(ROCKS1): $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o # dependency for all plugins -$(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) +$(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) $(LIBARMSUPPORT) $(PLUGINLIB): $(PLUGINLIB_OBJ) $(SILENT)$(shell rm -f $@) @@ -129,7 +129,7 @@ endif $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ -$(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(PLUGIN_CRT0) +$(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(LIBARMSUPPORT) $(PLUGIN_CRT0) $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \ $(filter %.o, $^) \ $(filter %.a, $+) \ |