7 files changed, 114 insertions, 5 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 73a886fd..81649a4f 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/common			\
 	-DRED_STATISTICS			\
-	-DSW_CANVAS_IMAGE_CACHE			\
 	$(Z_LIBS)				\
 	$(CELT051_CFLAGS)			\
 	$(PIXMAN_CFLAGS)			\
@@ -89,6 +88,8 @@ libspice_server_la_SOURCES =			\
 	red_worker.h				\
 	reds.c					\
 	reds.h					\
+	reds_sw_canvas.c			\
+	reds_sw_canvas.h			\
 	snd_worker.c				\
 	snd_worker.h				\
 	spice-experimental.h			\
@@ -105,6 +106,13 @@ libspice_server_la_SOURCES +=	\
 	$(NULL)
 endif
 
+if SUPPORT_GL
+libspice_server_la_SOURCES +=	\
+	reds_gl_canvas.c	\
+	reds_gl_canvas.h	\
+	$(NULL)
+endif
+
 if SUPPORT_SMARTCARD
 libspice_server_la_SOURCES +=	\
 	smartcard.c		\
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c
index 06924580..c5cac589 100644
--- a/server/red_dispatcher.c
+++ b/server/red_dispatcher.c
@@ -28,9 +28,9 @@
 #include "spice.h"
 #include "red_worker.h"
 #include "quic.h"
-#include "sw_canvas.h"
+#include "reds_sw_canvas.h"
 #ifdef USE_OGL
-#include "gl_canvas.h"
+#include "reds_gl_canvas.h"
 #endif // USE_OGL
 #include "reds.h"
 #include "red_dispatcher.h"
diff --git a/server/red_worker.c b/server/red_worker.c
index 49dffb47..8082139b 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -36,9 +36,9 @@
 #include "region.h"
 #include <spice/protocol.h>
 #include "red_worker.h"
-#include "sw_canvas.h"
+#include "reds_sw_canvas.h"
 #ifdef USE_OGL
-#include "gl_canvas.h"
+#include "reds_gl_canvas.h"
 #include "ogl_ctx.h"
 #endif /* USE_OGL */
 #include "quic.h"
diff --git a/server/reds_gl_canvas.c b/server/reds_gl_canvas.c
new file mode 100644
index 00000000..4855a203
--- /dev/null
+++ b/server/reds_gl_canvas.c
@@ -0,0 +1,24 @@
+/*
+   Copyright (C) 2011 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+#include "config.h"
+
+#include "reds_gl_canvas.h"
+#define SPICE_CANVAS_INTERNAL
+#define SW_CANVAS_IMAGE_CACHE
+#include "gl_canvas.c"
+#undef SW_CANVAS_IMAGE_CACHE
+#undef SPICE_CANVAS_INTERNAL
diff --git a/server/reds_gl_canvas.h b/server/reds_gl_canvas.h
new file mode 100644
index 00000000..c20cca50
--- /dev/null
+++ b/server/reds_gl_canvas.h
@@ -0,0 +1,27 @@
+/*
+   Copyright (C) 2011 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _H_REDS_GL_CANVAS
+#define _H_REDS_GL_CANVAS
+
+#define SPICE_CANVAS_INTERNAL
+#define SW_CANVAS_IMAGE_CACHE
+#include "gl_canvas.h"
+#undef SW_CANVAS_IMAGE_CACHE
+#undef SPICE_CANVAS_INTERNAL
+
+#endif
diff --git a/server/reds_sw_canvas.c b/server/reds_sw_canvas.c
new file mode 100644
index 00000000..428a9dce
--- /dev/null
+++ b/server/reds_sw_canvas.c
@@ -0,0 +1,24 @@
+/*
+   Copyright (C) 2011 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+#include "config.h"
+
+#include "reds_sw_canvas.h"
+#define SPICE_CANVAS_INTERNAL
+#define SW_CANVAS_IMAGE_CACHE
+#include "sw_canvas.c"
+#undef SW_CANVAS_IMAGE_CACHE
+#undef SPICE_CANVAS_INTERNAL
diff --git a/server/reds_sw_canvas.h b/server/reds_sw_canvas.h
new file mode 100644
index 00000000..00e61562
--- /dev/null
+++ b/server/reds_sw_canvas.h
@@ -0,0 +1,26 @@
+/*
+   Copyright (C) 2011 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef _H_REDS_SW_CANVAS
+#define _H_REDS_SW_CANVAS
+
+#define SPICE_CANVAS_INTERNAL
+#define SW_CANVAS_IMAGE_CACHE
+#include "sw_canvas.h"
+#undef SW_CANVAS_IMAGE_CACHE
+#undef SPICE_CANVAS_INTERNAL
+
+#endif