From 239b2b66b2cfd46abe8d84162a74a7e47a54d85b Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 18 Feb 2010 21:00:24 +0100 Subject: Remove qcairo dependency, only use pixman --- client/canvas.h | 1 - client/display_channel.h | 1 - client/x11/Makefile.am | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'client') diff --git a/client/canvas.h b/client/canvas.h index 65856565..79400cc3 100644 --- a/client/canvas.h +++ b/client/canvas.h @@ -21,7 +21,6 @@ #include "common.h" #include "debug.h" #include "region.h" -#include "cairo.h" #include #include "cache.hpp" #include "shared_cache.hpp" diff --git a/client/display_channel.h b/client/display_channel.h index 802898f5..b2e37914 100644 --- a/client/display_channel.h +++ b/client/display_channel.h @@ -22,7 +22,6 @@ #include "canvas.h" #include "region.h" #include "red_channel.h" -#include "cairo.h" #include "cache.hpp" #include "screen_layer.h" #include "process_loop.h" diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index d645c389..d703101e 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = \ $(GL_CFLAGS) \ $(ALSA_CFLAGS) \ $(FFMPEG_CFLAGS) \ - $(QCAIRO_CFLAGS) \ + $(PIXMAN_CFLAGS) \ $(LOG4CPP_CFLAGS) \ $(CELT051_CFLAGS) \ $(SSL_CFLAGS) \ @@ -155,7 +155,7 @@ spicec_LDFLAGS = \ $(CEGUI_LIBS) spicec_LDADD = \ - $(QCAIRO_LIBS) \ + $(PIXMAN_LIBS) \ $(FFMPEG_LIBS) \ $(ALSA_LIBS) \ $(GL_LIBS) \ -- cgit