From 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 21 Mar 2012 14:42:35 +0100 Subject: Use the spice-common submodule This patch will replace the common/ directory with the spice-common project. It is for now a simple project subdirectory shared with spice-gtk, but the goal is to make it a proper library later on. With this change, the spice-server build is broken. The following commits fix the build, and have been seperated to ease the review. v2 - moves all the generated marshallers to spice-common library - don't attempt to fix windows VS build, which should somehow be splitted with spice-common (or built from tarball only to avoid generation tools/libs deps) v3 - uses libspice-common-client - fix a mutex.h inclusion reported by Alon --- server/reds_sw_canvas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/reds_sw_canvas.h') diff --git a/server/reds_sw_canvas.h b/server/reds_sw_canvas.h index 00e61562..f065be53 100644 --- a/server/reds_sw_canvas.h +++ b/server/reds_sw_canvas.h @@ -19,7 +19,7 @@ #define SPICE_CANVAS_INTERNAL #define SW_CANVAS_IMAGE_CACHE -#include "sw_canvas.h" +#include "common/sw_canvas.h" #undef SW_CANVAS_IMAGE_CACHE #undef SPICE_CANVAS_INTERNAL -- cgit