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_client.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'client/red_client.cpp') diff --git a/client/red_client.cpp b/client/red_client.cpp index 04544083..8f86d3ef 100644 --- a/client/red_client.cpp +++ b/client/red_client.cpp @@ -18,15 +18,16 @@ #include #endif -#include "common.h" +#include #include +#include "common/client_marshallers.h" + +#include "common.h" #include "red_client.h" #include "application.h" #include "process_loop.h" #include "utils.h" #include "debug.h" -#include "marshallers.h" -#include #ifndef INFINITY #define INFINITY HUGE -- cgit