diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-28 17:51:58 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-28 17:51:58 +0200 |
| commit | 0a2e078b875a7f256b39f4be204bc5336bbff232 (patch) | |
| tree | 0f8a6b1e79aa3cd7dd5d9cd8f039a338769e621b | |
| parent | 13f36d09c49624ffc1f8c9b5cc8a76b7272b4448 (diff) | |
| download | graphlcd-base-0a2e078b875a7f256b39f4be204bc5336bbff232.tar.gz graphlcd-base-0a2e078b875a7f256b39f4be204bc5336bbff232.tar.bz2 | |
configure imagemagick/graphicsmagick-support in Make.config
| -rw-r--r-- | Make.config | 3 | ||||
| -rw-r--r-- | glcdgraphics/Makefile | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Make.config b/Make.config index cdafd16..692d62c 100644 --- a/Make.config +++ b/Make.config @@ -34,3 +34,6 @@ DEFINES += -D_GNU_SOURCE # comment this variable out if you don't want to use FreeType2 font rendering HAVE_FREETYPE2=1 +# uncomment one of the following two lines if you want either GraphicsMagick/ImageMagick support +#HAVE_IMAGEMAGICK=1 +#HAVE_GRAPHICSMAGICK=1 diff --git a/glcdgraphics/Makefile b/glcdgraphics/Makefile index d301804..3e6cd1a 100644 --- a/glcdgraphics/Makefile +++ b/glcdgraphics/Makefile @@ -5,8 +5,12 @@ -include ../Make.config # External image lib to use: imagemagick, graphicsmagick, or none -# taken from text2skin -IMAGELIB = +IMAGELIB = +ifdef HAVE_IMAGEMAGICK + IMAGELIB = imagemagick +else ifdef HAVE_GRAPHICSMAGICK + IMAGELIB = graphicsmagick +endif CXXFLAGS += -fPIC |