[Spice-devel] [PATCH 01/11] client/Makefile.am: mingw32 fixes

[Christophe Fergeau]

On Fri, Jan 13, 2012 at 01:35:44PM +0200, Alon Levy wrote:
> * build resource file with windres
> * include client/windows and not client/x11
> * use CXIMAGE_CFLAGS (it's already set to -DDISABLE_CXIMAGE correctly)
> ---
>  client/Makefile.am |   15 ++++++++++++++-
>  1 files changed, 14 insertions(+), 1 deletions(-)
> 
> diff --git a/client/Makefile.am b/client/Makefile.am
> index f7c9c56..20ebedb 100644
> --- a/client/Makefile.am
> +++ b/client/Makefile.am
> @@ -136,6 +136,11 @@ spicec_SOURCES +=			\
>  	windows/stdint.h		\
>  	windows/win_platform.h		\
>  	$(NULL)
> +
> +spicec_resource_ldadd = windows/redc.o

Why in lower case? ACK otherwise

> +
> +windows/redc.o: windows/redc.rc
> +	$(WINDRES) $< -o $@
>  else
>  spicec_SOURCES +=			\
>  	x11/atomic_count.h		\
> @@ -167,6 +172,12 @@ spicec_SOURCES +=			\
>  	$(NULL)
>  endif
>  
> +if OS_WIN32
> +PLATFORM_INCLUDES=-I$(top_srcdir)/client/windows
> +else
> +PLATFORM_INCLUDES=-I$(top_srcdir)/client/x11
> +endif
> +
>  if SUPPORT_TUNNEL
>  spicec_SOURCES +=		\
>  	tunnel_channel.cpp	\
> @@ -210,7 +221,7 @@ endif
>  
>  INCLUDES = \
>  	-D__STDC_LIMIT_MACROS				\
> -	-I$(top_srcdir)/client/x11			\
> +	$(PLATFORM_INCLUDES)				\
>  	-I$(top_srcdir)/common				\
>  	$(ALSA_CFLAGS)					\
>  	$(CEGUI_CFLAGS)					\
> @@ -227,6 +238,7 @@ INCLUDES = \
>  	$(XFIXES_CFLAGS)				\
>  	$(WARN_CFLAGS)					\
>  	$(XINERAMA_CFLAGS)				\
> +	$(CXIMAGE_CFLAGS)				\
>  	$(NULL)
>  
>  spicec_LDFLAGS = $(SPICEC_STATIC_LINKAGE_BSTATIC)
> @@ -248,6 +260,7 @@ spicec_LDADD =						\
>  	$(XRANDR_LIBS)					\
>  	$(Z_LIBS)					\
>  	$(XINERAMA_LIBS)				\
> +	$(spicec_resource_ldadd)			\
>  	$(NULL)
>  
>  EXTRA_DIST =				\
> -- 
> 1.7.8.2
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- 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/20120113/b58a1cf5/attachment.pgp>