From 7f9fc20afa3bcff007da941041ceb0c0d84d8fc3 Mon Sep 17 00:00:00 2001 From: Vencislav Atanasov Date: Sun, 28 Jul 2019 19:44:23 +0300 Subject: 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 --- apps/plugins/bitmaps/pluginbitmaps.make | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps/plugins/bitmaps/pluginbitmaps.make') 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) -- cgit v1.2.3