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 --- client/red_gl_canvas.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'client/red_gl_canvas.cpp') diff --git a/client/red_gl_canvas.cpp b/client/red_gl_canvas.cpp index 59c8f06b..81203d99 100644 --- a/client/red_gl_canvas.cpp +++ b/client/red_gl_canvas.cpp @@ -18,21 +18,22 @@ #include #endif -#include "common.h" #include -#include "red_gl_canvas.h" -#include "utils.h" -#include "debug.h" -#include "region.h" -#include "red_pixmap_gl.h" #include +#include "common/region.h" #define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE -#include "gl_canvas.c" +#include "common/gl_canvas.c" #undef SW_CANVAS_CACHE #undef SPICE_CANVAS_INTERNAL +#include "common.h" +#include "red_gl_canvas.h" +#include "utils.h" +#include "debug.h" +#include "red_pixmap_gl.h" + GCanvas::GCanvas(int width, int height, uint32_t format, RedWindow *win, RenderType rendertype, PixmapCache& pixmap_cache, PaletteCache& palette_cache, -- cgit