diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-29 11:18:53 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-29 11:18:53 +0200 |
| commit | 4c345e10f3587a9ed1bdcd1fb10e68c27f876961 (patch) | |
| tree | 76d7770ec029acd141dbb03efdd4cb65ebcc2cf8 | |
| parent | 0a2e078b875a7f256b39f4be204bc5336bbff232 (diff) | |
| download | graphlcd-base-4c345e10f3587a9ed1bdcd1fb10e68c27f876961.tar.gz graphlcd-base-4c345e10f3587a9ed1bdcd1fb10e68c27f876961.tar.bz2 | |
cleanup: remove old eColor-based code-lines; make linker happy if --as-needed is used when compiling
| -rw-r--r-- | glcdgraphics/bitmap.h | 1 | ||||
| -rw-r--r-- | glcdskin/skin.h | 5 | ||||
| -rw-r--r-- | tools/lcdtestpattern/Makefile | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/glcdgraphics/bitmap.h b/glcdgraphics/bitmap.h index 0528441..c9fd0e0 100644 --- a/glcdgraphics/bitmap.h +++ b/glcdgraphics/bitmap.h @@ -21,6 +21,7 @@ #include <inttypes.h> // graphlcd-base uses ARGB bitmaps instead of 1bit ones +// this flag will be checked in current versions of vdr-graphlcd-plugin #define GRAPHLCD_CBITMAP_ARGB namespace GLCD diff --git a/glcdskin/skin.h b/glcdskin/skin.h index b13db0a..a095ebb 100644 --- a/glcdskin/skin.h +++ b/glcdskin/skin.h @@ -64,13 +64,8 @@ public: bool ParseEnable(const std::string &Text); -#ifdef GRAPHLCD_CBITMAP_ARGB cColor GetBackgroundColor(void) { return config.GetDriver()->GetBackgroundColor(); } cColor GetForegroundColor(void) { return config.GetDriver()->GetForegroundColor(); } -#else - eColor GetBackgroundColor(void) { return config.GetDriver()->GetBackgroundColor(); } - eColor GetForegroundColor(void) { return config.GetDriver()->GetForegroundColor(); } -#endif }; } // end of namespace diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile index da165e2..4901534 100644 --- a/tools/lcdtestpattern/Makefile +++ b/tools/lcdtestpattern/Makefile @@ -32,7 +32,7 @@ $(DEPFILE): Makefile # The main program: $(PRGNAME): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcddrivers -lglcdgraphics -lstdc++ -o $(PRGNAME) install: $(PRGNAME) install -d $(BINDIR) |