diff options
| author | Magnus Holmgren <magnushol@gmail.com> | 2012-02-18 16:50:19 +0100 |
|---|---|---|
| committer | Magnus Holmgren <magnushol@gmail.com> | 2012-02-18 16:51:50 +0100 |
| commit | 488f6229c0974fc9a7ff8762f1c35673b2747039 (patch) | |
| tree | a5b9d1b55439f0568a59a368d205fca08a24def6 | |
| parent | ff36a5423e2679db2da04244475c8014075d12f7 (diff) | |
| download | rockbox-488f6229c0974fc9a7ff8762f1c35673b2747039.tar.gz rockbox-488f6229c0974fc9a7ff8762f1c35673b2747039.zip | |
libarm_support references code in libplugin, so put libarm_support first of the two when linking. There may be better solutions, but this fixes linking problems for me (on Cygwin).
Change-Id: I5b2c87d5986cf5cba6652aad4ece0647e1178474
| -rw-r--r-- | apps/plugins/imageviewer/imageviewer.make | 2 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/imageviewer/imageviewer.make b/apps/plugins/imageviewer/imageviewer.make index f5bd6c0122..76cc3e266d 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) $(LIBARMSUPPORT) $(PLUGINBITMAPLIB) | 50 | $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(LIBARMSUPPORT) $(PLUGINLIB) $(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/plugins.make b/apps/plugins/plugins.make index 76cdea63f0..272b1b8e93 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) $(LIBARMSUPPORT) | 68 | $(ROCKS): $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(LIBARMSUPPORT) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(PLUGIN_CRT0) $(LIBSETJMP) |
| 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) $(LIBARMSUPPORT) $(PLUGIN_CRT0) | 132 | $(BUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(LIBARMSUPPORT) $(PLUGINLIB) $(PLUGINBITMAPLIB) $(LIBSETJMP) $(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, $+) \ |