diff options
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 d3525791cd..e18b92c1f0 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 | |||
201 | $(CODECLIB) \ | 201 | $(CODECLIB) \ |
202 | -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) | 202 | -lgcc $(subst .map,-pre.map,$(CODECLDFLAGS)) |
203 | 203 | ||
204 | $(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) | 204 | $(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) $(LIBARMSUPPORT) |
205 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ | 205 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \ |
206 | $(filter %.o, $^) \ | 206 | $(filter %.o, $^) \ |
207 | $(filter %.a, $+) \ | 207 | $(filter %.a, $+) \ |
diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES index cd38dc1545..257dcb5838 100644 --- a/apps/codecs/lib/SOURCES +++ b/apps/codecs/lib/SOURCES | |||
@@ -7,10 +7,6 @@ mdct_lookup.c | |||
7 | fft-ffmpeg.c | 7 | fft-ffmpeg.c |
8 | mdct.c | 8 | mdct.c |
9 | 9 | ||
10 | #ifdef CPU_ARM | ||
11 | ../../../firmware/target/arm/support-arm.S | ||
12 | #endif | ||
13 | |||
14 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) | 10 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) |
15 | osx.dummy.c | 11 | osx.dummy.c |
16 | #endif | 12 | #endif |
diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make index d06bbfd571..8f933e3046 100644 --- a/apps/plugins/imageviewer/imageviewer.make +++ b/apps/plugins/imageviewer/imageviewer.make | |||
@@ -47,7 +47,7 @@ else | |||
47 | endif | 47 | endif |
48 | 48 | ||
49 | # rule to create reference map for image decoder | 49 | # rule to create reference map for image decoder |
50 | $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) | 50 | $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(LIBARMSUPPORT) $(PLUGINBITMAPLIB) |
51 | $(call PRINTS,LD $(@F))$(CC) $(IMGDECFLAGS) -o /dev/null \ | 51 | $(call PRINTS,LD $(@F))$(CC) $(IMGDECFLAGS) -o /dev/null \ |
52 | $(filter %.o, $^) \ | 52 | $(filter %.o, $^) \ |
53 | $(filter %.a, $+) \ | 53 | $(filter %.a, $+) \ |
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index 2c0fc2a611..4b33901088 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -41,7 +41,6 @@ playergfx.c | |||
41 | #ifdef HAVE_LCD_BITMAP | 41 | #ifdef HAVE_LCD_BITMAP |
42 | 42 | ||
43 | #ifdef CPU_ARM | 43 | #ifdef CPU_ARM |
44 | ../../../firmware/target/arm/support-arm.S | ||
45 | pluginlib_jpeg_idct_arm.S | 44 | pluginlib_jpeg_idct_arm.S |
46 | #endif | 45 | #endif |
47 | 46 | ||
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index fca37aa763..1bf78d82c1 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -65,7 +65,7 @@ PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) | |||
65 | $(ROCKS1): $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o | 65 | $(ROCKS1): $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o |
66 | 66 | ||
67 | # dependency for all plugins | 67 | # dependency for all plugins |
68 | $(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) | 68 | $(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) $(LIBARMSUPPORT) |
69 | 69 | ||
70 | $(PLUGINLIB): $(PLUGINLIB_OBJ) | 70 | $(PLUGINLIB): $(PLUGINLIB_OBJ) |
71 | $(SILENT)$(shell rm -f $@) | 71 | $(SILENT)$(shell rm -f $@) |
@@ -129,7 +129,7 @@ endif | |||
129 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua | 129 | $(BUILDDIR)/apps/plugins/%.lua: $(ROOTDIR)/apps/plugins/%.lua |
130 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ | 130 | $(call PRINTS,CP $(subst $(ROOTDIR)/,,$<))cp $< $(BUILDDIR)/apps/plugins/ |
131 | 131 | ||
132 | $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(PLUGIN_CRT0) | 132 | $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(LIBARMSUPPORT) $(PLUGIN_CRT0) |
133 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \ | 133 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \ |
134 | $(filter %.o, $^) \ | 134 | $(filter %.o, $^) \ |
135 | $(filter %.a, $+) \ | 135 | $(filter %.a, $+) \ |