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 endif # Set up the bitmap libraries -BITMAPLIBS = $(BUILDDIR)/libbitmapsmono.a \ - $(BUILDDIR)/libbitmapsnative.a \ - $(BUILDDIR)/libbitmapsremotemono.a \ - $(BUILDDIR)/libbitmapsremotenative.a - -LINKBITMAPS = -lbitmapsmono -lbitmapsnative -lbitmapsremotemono -lbitmapsremotenative +BITMAPLIBS = +LINKBITMAPS = +ifneq ($(strip $(BMP2RB_MONO)),) + BITMAPLIBS += $(BUILDDIR)/libbitmapsmono.a + LINKBITMAPS += -lbitmapsmono +endif +ifneq ($(strip $(BMP2RB_NATIVE)),) + BITMAPLIBS += $(BUILDDIR)/libbitmapsnative.a + LINKBITMAPS += -lbitmapsnative +endif +ifneq ($(strip $(BMP2RB_REMOTEMONO)),) + BITMAPLIBS += $(BUILDDIR)/libbitmapsremotemono.a + LINKBITMAPS += -lbitmapsremotemono +endif +ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) + BITMAPLIBS += $(BUILDDIR)/libbitmapsremotenative.a + LINKBITMAPS += -lbitmapsremotenative +endif # This sets up 'SRC' based on the files mentioned in SOURCES 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 endif # Set up the bitmap libraries -BITMAPLIBS = $(BUILDDIR)/libpluginbitmapsmono.a \ - $(BUILDDIR)/libpluginbitmapsnative.a \ - $(BUILDDIR)/libpluginbitmapsremotemono.a \ - $(BUILDDIR)/libpluginbitmapsremotenative.a - -LINKBITMAPS = -lpluginbitmapsmono -lpluginbitmapsnative \ - -lpluginbitmapsremotemono -lpluginbitmapsremotenative +BITMAPLIBS = +LINKBITMAPS = +ifneq ($(strip $(BMP2RB_MONO)),) + BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsmono.a + LINKBITMAPS += -lpluginbitmapsmono +endif +ifneq ($(strip $(BMP2RB_NATIVE)),) + BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsnative.a + LINKBITMAPS += -lpluginbitmapsnative +endif +ifneq ($(strip $(BMP2RB_REMOTEMONO)),) + BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsremotemono.a + LINKBITMAPS += -lpluginbitmapsremotemono +endif +ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) + BITMAPLIBS += $(BUILDDIR)/libpluginbitmapsremotenative.a + LINKBITMAPS += -lpluginbitmapsremotenative +endif LDS := plugin.lds LINKFILE := $(OBJDIR)/pluginlink.lds |