diff options
Diffstat (limited to 'apps')
-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 | |||
26 | 26 | ||
27 | ifdef PBMP # does player use bitmaps? | 27 | ifdef PBMP # does player use bitmaps? |
28 | 28 | ||
29 | PLUGIN_BITMAPS := $(PBMP:$(ROOTDIR)/%.bmp=$(BUILDDIR)/%.o) | 29 | PBMP_BUILD := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PBMP)) |
30 | |||
31 | PLUGIN_BITMAPS := $(PBMP_BUILD:%.bmp=%.o) | ||
30 | 32 | ||
31 | PLUGINBITMAPLIB := $(BUILDDIR)/apps/plugins/bitmaps/libpluginbitmaps.a | 33 | PLUGINBITMAPLIB := $(BUILDDIR)/apps/plugins/bitmaps/libpluginbitmaps.a |
32 | PLUGINBITMAPDIR := $(dir $(PLUGINBITMAPLIB)) | 34 | PLUGINBITMAPDIR := $(dir $(PLUGINBITMAPLIB)) |
33 | 35 | ||
34 | PBMPHFILES := $(subst $(ROOTDIR),$(BUILDDIR),$(PBMP)) | 36 | 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 }" ) |
35 | 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 }" ) | ||
36 | 37 | ||
37 | $(PBMPHFILES): $(PLUGIN_BITMAPS) | 38 | $(PBMPHFILES): $(PLUGIN_BITMAPS) |
38 | 39 | ||
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) | |||
22 | endif | 22 | endif |
23 | OTHER_SRC += $(PLUGINS_SRC) | 23 | OTHER_SRC += $(PLUGINS_SRC) |
24 | ROCKS1 := $(PLUGINS_SRC:.c=.rock) | 24 | ROCKS1 := $(PLUGINS_SRC:.c=.rock) |
25 | ROCKS1 := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS1)) | 25 | ROCKS1 := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(ROCKS1)) |
26 | 26 | ||
27 | ROCKS := $(ROCKS1) | 27 | ROCKS := $(ROCKS1) |
28 | 28 | ||
@@ -35,7 +35,7 @@ OTHER_SRC += $(PLUGINLIB_SRC) | |||
35 | 35 | ||
36 | PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o) | 36 | PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o) |
37 | PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) | 37 | PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) |
38 | PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) | 38 | PLUGINLIB_OBJ := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PLUGINLIB_OBJ)) |
39 | 39 | ||
40 | ### build data / rules | 40 | ### build data / rules |
41 | ifndef APP_TYPE | 41 | ifndef APP_TYPE |