From 2db7212175c51f4121790bfd1fd677c0b77833d5 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 20 Apr 2011 17:50:22 +0200 Subject: 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. --- client/application.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'client/application.cpp') diff --git a/client/application.cpp b/client/application.cpp index 292dae6a..9e2c7e19 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -31,8 +31,10 @@ #include "red_gdi_canvas.h" #endif #include "platform.h" -#include "sw_canvas.h" -#include "gl_canvas.h" +#include "red_sw_canvas.h" +#ifdef USE_OGL +#include "red_gl_canvas.h" +#endif #include "quic.h" #include "mutex.h" #include "cmd_line_parser.h" -- cgit