diff options
| author | Vencislav Atanasov <user890104@freemyipod.org> | 2019-07-28 19:44:23 +0300 |
|---|---|---|
| committer | Franklin Wei <franklin@rockbox.org> | 2019-07-28 21:00:57 +0200 |
| commit | 7f9fc20afa3bcff007da941041ceb0c0d84d8fc3 (patch) | |
| tree | c28397eb6de5f942e36811b3f4dbe717e4065d05 /apps/plugins | |
| parent | d8330c9c18ac227800ed7dc9c6ae72946e92e4fb (diff) | |
| download | rockbox-7f9fc20afa3bcff007da941041ceb0c0d84d8fc3.tar.gz rockbox-7f9fc20afa3bcff007da941041ceb0c0d84d8fc3.zip | |
Use full_path_subst on more places, to avoid replacing the wrong occurrences in
paths.
If ROOTDIR=/rockbox and BUILDDIR=/rockbox/build-something, it is now possible to
successfully build both target binaries and simulators.
Change-Id: If12d1d5933c5a15feebf627a4f1636dc1e3a67fa
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/bitmaps/pluginbitmaps.make | 7 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/plugins/bitmaps/pluginbitmaps.make b/apps/plugins/bitmaps/pluginbitmaps.make index 85536ed3bb..78294a5e8c 100644 --- a/apps/plugins/bitmaps/pluginbitmaps.make +++ b/apps/plugins/bitmaps/pluginbitmaps.make @@ -26,13 +26,14 @@ endif ifdef PBMP # does player use bitmaps? -PLUGIN_BITMAPS := $(PBMP:$(ROOTDIR)/%.bmp=$(BUILDDIR)/%.o) +PBMP_BUILD := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PBMP)) + +PLUGIN_BITMAPS := $(PBMP_BUILD:%.bmp=%.o) PLUGINBITMAPLIB := $(BUILDDIR)/apps/plugins/bitmaps/libpluginbitmaps.a PLUGINBITMAPDIR := $(dir $(PLUGINBITMAPLIB)) -PBMPHFILES := $(subst $(ROOTDIR),$(BUILDDIR),$(PBMP)) -PBMPHFILES := $(shell echo $(PBMPHFILES) | sed -e 's/\.[0-9x]*\.bmp/.h/g' -e 's/\.bmp/.h/g' | awk "{ gsub(/apps\/plugins\/bitmaps\/(mono|native|remote_mono|remote_native)/, \"pluginbitmaps\"); print }" ) +PBMPHFILES := $(shell echo $(PBMP_BUILD) | sed -e 's/\.[0-9x]*\.bmp/.h/g' -e 's/\.bmp/.h/g' | awk "{ gsub(/apps\/plugins\/bitmaps\/(mono|native|remote_mono|remote_native)/, \"pluginbitmaps\"); print }" ) $(PBMPHFILES): $(PLUGIN_BITMAPS) diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index be3d35717e..d395c00e82 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -22,7 +22,7 @@ PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES) endif OTHER_SRC += $(PLUGINS_SRC) ROCKS1 := $(PLUGINS_SRC:.c=.rock) -ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1)) +ROCKS1 := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(ROCKS1)) ROCKS := $(ROCKS1) @@ -35,7 +35,7 @@ OTHER_SRC += $(PLUGINLIB_SRC) PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o) PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) -PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) +PLUGINLIB_OBJ := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PLUGINLIB_OBJ)) ### build data / rules ifndef APP_TYPE |