diff options
-rw-r--r-- | apps/Makefile | 24 | ||||
-rw-r--r-- | apps/plugins/Makefile | 25 |
2 files changed, 36 insertions, 13 deletions
diff --git a/apps/Makefile b/apps/Makefile index 3f106d10f6..1f9ab284fa 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -23,12 +23,24 @@ CODECS=build-codecs | |||
23 | endif | 23 | endif |
24 | 24 | ||
25 | # Set up the bitmap libraries | 25 | # Set up the bitmap libraries |
26 | BITMAPLIBS = $(BUILDDIR)/libbitmapsmono.a \ | 26 | BITMAPLIBS = |
27 | $(BUILDDIR)/libbitmapsnative.a \ | 27 | LINKBITMAPS = |
28 | $(BUILDDIR)/libbitmapsremotemono.a \ | 28 | ifneq ($(strip $(BMP2RB_MONO)),) |
29 | $(BUILDDIR)/libbitmapsremotenative.a | 29 | BITMAPLIBS += $(BUILDDIR)/libbitmapsmono.a |
30 | 30 | LINKBITMAPS += -lbitmapsmono | |
31 | LINKBITMAPS = -lbitmapsmono -lbitmapsnative -lbitmapsremotemono -lbitmapsremotenative | 31 | endif |
32 | ifneq ($(strip $(BMP2RB_NATIVE)),) | ||
33 | BITMAPLIBS += $(BUILDDIR)/libbitmapsnative.a | ||
34 | LINKBITMAPS += -lbitmapsnative | ||
35 | endif | ||
36 | ifneq ($(strip $(BMP2RB_REMOTEMONO)),) | ||
37 | BITMAPLIBS += $(BUILDDIR)/libbitmapsremotemono.a | ||
38 | LINKBITMAPS += -lbitmapsremotemono | ||
39 | endif | ||
40 | ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) | ||
41 | BITMAPLIBS += $(BUILDDIR)/libbitmapsremotenative.a | ||
42 | LINKBITMAPS += -lbitmapsremotenative | ||
43 | endif | ||
32 | 44 | ||
33 | # This sets up 'SRC' based on the files mentioned in SOURCES | 45 | # This sets up 'SRC' based on the files mentioned in SOURCES |
34 | include $(TOOLSDIR)/makesrc.inc | 46 | include $(TOOLSDIR)/makesrc.inc |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 04bb62fbe3..ca3b51482c 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -21,13 +21,24 @@ ifdef SOFTWARECODECS | |||
21 | endif | 21 | endif |
22 | 22 | ||
23 | # Set up the bitmap libraries | 23 | # Set up the bitmap libraries |
24 | BITMAPLIBS = $(BUILDDIR)/libpluginbitmapsmono.a \ | 24 | BITMAPLIBS = |
25 | $(BUILDDIR)/libpluginbitmapsnative.a \ | 25 | LINKBITMAPS = |
26 | $(BUILDDIR)/libpluginbitmapsremotemono.a \ | 26 | ifneq ($(strip $(BMP2RB_MONO)),) |
27 | $(BUILDDIR)/libpluginbitmapsremotenative.a | 27 | BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsmono.a |
28 | 28 | LINKBITMAPS += -lpluginbitmapsmono | |
29 | LINKBITMAPS = -lpluginbitmapsmono -lpluginbitmapsnative \ | 29 | endif |
30 | -lpluginbitmapsremotemono -lpluginbitmapsremotenative | 30 | ifneq ($(strip $(BMP2RB_NATIVE)),) |
31 | BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsnative.a | ||
32 | LINKBITMAPS += -lpluginbitmapsnative | ||
33 | endif | ||
34 | ifneq ($(strip $(BMP2RB_REMOTEMONO)),) | ||
35 | BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsremotemono.a | ||
36 | LINKBITMAPS += -lpluginbitmapsremotemono | ||
37 | endif | ||
38 | ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) | ||
39 | BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsremotenative.a | ||
40 | LINKBITMAPS += -lpluginbitmapsremotenative | ||
41 | endif | ||
31 | 42 | ||
32 | LDS := plugin.lds | 43 | LDS := plugin.lds |
33 | LINKFILE := $(OBJDIR)/pluginlink.lds | 44 | LINKFILE := $(OBJDIR)/pluginlink.lds |