From 8bf7b33c1dd3e131af1826e64a1bc51d1b0ac29e Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Tue, 28 Oct 2014 19:38:11 +0100 Subject: Use cairo to read PNG files --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2160ae6..7b2b7d8 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,9 @@ else ifeq ($(IMAGELIB), graphicsmagick) LIBS += $(shell pkg-config --libs GraphicsMagick++) endif +INCLUDES += $(shell pkg-config --cflags cairo-png) +LIBS += $(shell pkg-config --libs cairo-png) + LIBS += $(shell xml2-config --libs) ### The object files: -- cgit v1.2.3 From 94542945595f39866f868181f79583d20a019d1f Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Thu, 30 Oct 2014 16:41:06 +0100 Subject: Removed ImageMagick dependency. Final class names for Cairo backend --- Makefile | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7b2b7d8..8277229 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,6 @@ # # $Id$ Makefile 1.0 2014/07/24 louis Exp $ -# External image lib to use: imagemagick, graphicsmagick -IMAGELIB = imagemagick - # The official name of this plugin. PLUGIN = skindesigner @@ -47,14 +44,6 @@ DEFINES += $(shell xml2-config --cflags) INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig) -ifeq ($(IMAGELIB), imagemagick) - INCLUDES += $(shell pkg-config --cflags Magick++) - LIBS += $(shell pkg-config --libs Magick++) -else ifeq ($(IMAGELIB), graphicsmagick) - INCLUDES += $(shell pkg-config --cflags GraphicsMagick++) - LIBS += $(shell pkg-config --libs GraphicsMagick++) -endif - INCLUDES += $(shell pkg-config --cflags cairo-png) LIBS += $(shell pkg-config --libs cairo-png) @@ -74,8 +63,6 @@ OBJS = $(PLUGIN).o \ libcore/pixmapcontainer.o \ libcore/fontmanager.o \ libcore/imagecache.o \ - libcore/imagemagickwrapper.o \ - libcore/imagescaler.o \ libcore/helpers.o \ libcore/imageloader.o \ libcore/recfolderinfo.o \ -- cgit v1.2.3 From f17af1f7136fb38cee6898dab514dd33f9363b4d Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Thu, 30 Oct 2014 21:07:26 +0100 Subject: Added SVG rendering support --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8277229..e3c9144 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ DEFINES += $(shell xml2-config --cflags) INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig) -INCLUDES += $(shell pkg-config --cflags cairo-png) -LIBS += $(shell pkg-config --libs cairo-png) +INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) +LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) LIBS += $(shell xml2-config --libs) -- cgit v1.2.3 From e07e56a3faced2f2ef7459cc13c2bda6f65f68ba Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Sun, 2 Nov 2014 13:41:21 +0100 Subject: Added JPEG support --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e3c9144..3f4b204 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ DEFINES += $(shell xml2-config --cflags) INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig) -INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) +INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -ljpeg +LIBS += $(shell pkg-config --libs librsvg-2.0 cairo-png) -ljpeg LIBS += $(shell xml2-config --libs) -- cgit v1.2.3