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/red_sw_canvas.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/red_sw_canvas.cpp')
-rw-r--r-- | client/red_sw_canvas.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/client/red_sw_canvas.cpp b/client/red_sw_canvas.cpp index 5f86dca1..d18af0f9 100644 --- a/client/red_sw_canvas.cpp +++ b/client/red_sw_canvas.cpp @@ -19,21 +19,25 @@ #include <config.h> #endif -#include "common.h" #include <stdint.h> -#include "red_window.h" -#include "red_sw_canvas.h" -#include "utils.h" -#include "debug.h" -#include "region.h" -#include "red_pixmap_sw.h" +#ifdef WIN32 +#include <winsock2.h> +#endif +#include "common/region.h" #define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE -#include "sw_canvas.c" +#include "common/sw_canvas.c" #undef SW_CANVAS_CACHE #undef SPICE_CANVAS_INTERNAL +#include "common.h" +#include "red_window.h" +#include "red_sw_canvas.h" +#include "utils.h" +#include "debug.h" +#include "red_pixmap_sw.h" + SCanvas::SCanvas(bool onscreen, int width, int height, uint32_t format, RedWindow *win, PixmapCache& pixmap_cache, PaletteCache& palette_cache, |