diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-21 14:42:35 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 18:59:10 +0200 |
| commit | 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch) | |
| tree | 3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /client/x11/red_window.cpp | |
| parent | 4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff) | |
| download | spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip | |
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
Diffstat (limited to 'client/x11/red_window.cpp')
| -rw-r--r-- | client/x11/red_window.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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 <stdio.h> +#include <spice/protocol.h> +#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 <spice/protocol.h> -#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 |