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 /common/gdi_canvas.c | |
| parent | 253aa0c960ccb3fd2cd6f6b2550ef09b9cbd5d1a (diff) | |
| download | spice-2db7212175c51f4121790bfd1fd677c0b77833d5.tar.gz spice-2db7212175c51f4121790bfd1fd677c0b77833d5.tar.xz spice-2db7212175c51f4121790bfd1fd677c0b77833d5.zip | |
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 'common/gdi_canvas.c')
| -rw-r--r-- | common/gdi_canvas.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c index 360e6bf1..27f644c1 100644 --- a/common/gdi_canvas.c +++ b/common/gdi_canvas.c @@ -16,6 +16,11 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + +#ifndef SPICE_CANVAS_INTERNAL +#error "This file shouldn't be compiled directly" +#endif + #include <windows.h> #include <wingdi.h> #include "gdi_canvas.h" |