[Spice-devel] [PATCH 3/8] autotools: correctly build canvas-related code

[Christophe Fergeau]

On Thu, Apr 21, 2011 at 02:00:17PM +0200, Christophe Fergeau wrote:
> diff --git a/common/Makefile.am b/common/Makefile.am
> index 0a2f9c1..501a6e1 100644
> --- a/common/Makefile.am
> +++ b/common/Makefile.am
> @@ -6,7 +6,6 @@ NULL =
>  
>  noinst_LTLIBRARIES = libspice-common.la
>  libspice_common_la_SOURCES =		\
> -	canvas_base.h			\
>  	canvas_utils.c			\
>  	canvas_utils.h			\
>  	draw.h				\
> @@ -34,21 +33,10 @@ libspice_common_la_SOURCES =		\
>  	rop3.c				\
>  	rop3.h				\
>  	spice_common.h			\
> -	sw_canvas.c			\
> -	sw_canvas.h			\
> -	$(NULL)
> -
> -if OS_WIN32
> -libspice_common_la_SOURCES +=		\
> -	gdi_canvas.h			\
> -	gdi_canvas.c			\
>  	$(NULL)
> -endif
>  
>  if SUPPORT_GL
>  libspice_common_la_SOURCES +=		\
> -	gl_canvas.h			\
> -	gl_canvas.c			\
>  	gl_utils.h			\
>  	glc.h				\
>  	glc.c				\

redc.vcproj needs to be updated accordingly, hopefully the patch below does
the trick:

diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index 0b1ecbf..70eb170 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -413,10 +413,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\gdi_canvas.c"
-				>
-			</File>
-			<File
 				RelativePath="..\generated_demarshallers.cpp"
 				>
 			</File>
@@ -637,10 +633,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\sw_canvas.c"
-				>
-			</File>
-			<File
 				RelativePath="..\threads.cpp"
 				>
 			</File>


Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20110422/146682ba/attachment.pgp>