diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-04-20 17:50:22 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2011-05-03 14:44:10 +0200 |
| commit | 2db7212175c51f4121790bfd1fd677c0b77833d5 (patch) | |
| tree | 8511c736d8a6ca3c0adc43059ff47cdc53f9a980 /client/red_sw_canvas.cpp | |
| parent | 253aa0c960ccb3fd2cd6f6b2550ef09b9cbd5d1a (diff) | |
autotools: correctly build canvas-related code
spice client and spice server shares code from
common/{gdi,gl,sw}_canvas.[ch]. However, while most of the code is
shared, the server code wants a canvas compiled with
SW_CANVAS_IMAGE_CACHE defined while the client code wants a canvas
compiled with SW_CANVAS_CACHE.
The initial autotools refactoring didn't take that into account,
this is now fixed by this commit. After this commit, the canvas
files from common/ are no longer compiled as part of the
libspice-common.la convenience library. Instead, there are "proxy"
canvas source files in client/ and server/ which #include the
appropriate C files after defining the relevant #define for the
binary that is being built.
To prevent misuse of the canvas c files and headers in common/,
SPICE_CANVAS_INTERNAL must be set when including the canvas headers
from common/ or when building the c files from common/ otherwise
the build will error out.
Diffstat (limited to 'client/red_sw_canvas.cpp')
| -rw-r--r-- | client/red_sw_canvas.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/red_sw_canvas.cpp b/client/red_sw_canvas.cpp index b580e61..fec6605 100644 --- a/client/red_sw_canvas.cpp +++ b/client/red_sw_canvas.cpp @@ -25,6 +25,12 @@ #include "region.h" #include "red_pixmap_sw.h" +#define SPICE_CANVAS_INTERNAL +#define SW_CANVAS_CACHE +#include "sw_canvas.c" +#undef SW_CANVAS_CACHE +#undef SPICE_CANVAS_INTERNAL + SCanvas::SCanvas(bool onscreen, int width, int height, uint32_t format, RedWindow *win, PixmapCache& pixmap_cache, PaletteCache& palette_cache, |