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/x11/red_window.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'client/x11/red_window.cpp') diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index fda90d59..83144a54 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -33,21 +33,22 @@ #endif // USE_OPENGL #include +#include +#include "common/region.h" + +#ifdef USE_OPENGL +#include "common/gl_utils.h" +#include "red_pixmap_gl.h" +#endif // USE_OPENGL + #include "red_window.h" #include "utils.h" #include "debug.h" #include "platform.h" #include "x_platform.h" #include "pixels_source_p.h" -#include -#include "region.h" -#ifdef USE_OPENGL -#include "gl_utils.h" -#include "red_pixmap_gl.h" -#endif // USE_OPENGL #include "x_icon.h" - #define X_RETRIES 10 #define X_RETRY_DELAY_MICRO (1000 * 100) #define RAISE_RETRIES X_RETRIES -- cgit