[glib/glib-2-28] win32: Update msvc infrastructure for gdk-pixbuf split and cairo-gobject

[Hans Breuer <hans src gnome org>]

commit ab222a344c827e051779ee1120eca96ed6f00e2f
Author: Hans Breuer <hans breuer org>
Date:   Fri Jul 6 18:15:32 2012 +0200

    win32: Update msvc infrastructure for gdk-pixbuf split and cairo-gobject

 build/win32/make.msc    |   22 +++++++++++++---------
 build/win32/module.defs |   14 ++++++++++----
 2 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/build/win32/make.msc b/build/win32/make.msc
index 3b534ea..687fb41 100644
--- a/build/win32/make.msc
+++ b/build/win32/make.msc
@@ -55,8 +55,9 @@ BABL_CFLAGS = -I $(BABL)
 BABL_LIBS = $(BABL)\babl\babl-1.0.lib
 
 # force inclusion of the _right_ cairoversion.h even when using without installation 
-CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO)
-CAIRO_LIBS = $(CAIRO)\src\libcairo.lib
+CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO) -I $(CAIRO)\util\cairo-gobject -DCAIRO_HAS_GOBJECT_FUNCTIONS
+CAIRO_LIBS = $(CAIRO)\src\libcairo.lib 
+CAIRO_GOBJECT_LIBS = $(CAIRO)\util\cairo-gobject\cairo-gobject.lib 
 
 DIRENT_CFLAGS = -I $(GLIB)\build\win32\dirent
 DIRENT_LIBS = $(GLIB)\build\win32\dirent\dirent.lib
@@ -83,9 +84,6 @@ FONTCONFIG_CFLAGS = -I $(DEVTOP)\include
 FONTCONFIG_LIBS = $(DEVTOP)\lib\fontconfig.lib
 !ENDIF
 
-GDK_PIXBUF_CFLAGS = -I $(GDK_PIXBUF)
-GDK_PIXBUF_LIBS = $(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib
-
 GIMP_CFLAGS = -I $(GIMP)
 GIMP_PLUGIN_LIBS = $(GIMP)\libgimp\gimp-$(GIMP_VER).lib $(GIMP)\libgimp\gimpui-$(GIMP_VER).lib
 
@@ -99,6 +97,9 @@ GTHREAD_LIBS = $(GLIB)\gthread\gthread-$(GLIB_VER).lib
 !IFNDEF GDK_PIXBUF
 GDK_PIXBUF_CFLAGS = $(GTK2_CFLAGS)
 GDK_PIXBUF_LIBS = $(GTK2_LIBS)
+!ELSE
+GDK_PIXBUF_CFLAGS = -I $(GDK_PIXBUF)
+GDK_PIXBUF_LIBS = $(GDK_PIXBUF)\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib 
 !ENDIF
 
 GNOMECANVAS_CFLAGS = -I $(GNOMECANVAS)
@@ -110,11 +111,11 @@ GNOMEPRINT_LIBS = $(GNOMEPRINT)\libgnomeprint\gnome-print-$(GNOMEPRINT_VER).lib
 GNOMEPRINTUI_CFLAGS = -I $(GNOMEPRINTUI)
 GNOMEPRINTUI_LIBS = $(GNOMEPRINTUI)\libgnomeprintui\gnome-printui-$(GNOMEPRINTUI_VER).lib
 
-GTK_CFLAGS = -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) 
-GTK_LIBS = $(GTK)\gtk\gtk.lib $(GTK)\gdk\gdk.lib 
+GTK_CFLAGS = -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK)  $(GDK_PIXBUF_CFLAGS) 
+GTK_LIBS = $(GTK)\gtk\gtk.lib $(GTK)\gdk\gdk.lib $(GDK_PIXBUF_LIBS) 
 
-GTK2_CFLAGS = $(GLIB_CFLAGS) $(ATK_CFLAGS) -I$(GTK2)\gdk -I$(GTK2)\gdk -I$(GTK2) -I$(PANGO) -I$(ATK) $(CAIRO_CFLAGS)
-GTK2_LIBS = $(GTK2)\gtk\gtk-win32-$(GTK2_VER).lib $(GTK2)\gdk\gdk-win32-$(GTK2_VER).lib $(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GTK2_VER).lib $(PANGO_LIBS)
+GTK2_CFLAGS = $(GLIB_CFLAGS) $(ATK_CFLAGS) -I$(GTK2)\gdk -I$(GTK2)\gdk -I$(GTK2) $(GDK_PIXBUF_CFLAGS) -I$(PANGO) -I$(ATK) $(CAIRO_CFLAGS)
+GTK2_LIBS = $(GTK2)\gtk\gtk-win32-$(GTK2_VER).lib $(GTK2)\gdk\gdk-win32-$(GTK2_VER).lib $(PANGO_LIBS)
 
 GTKGLAREA_CFLAGS = -I $(GTKGLAREA)
 GTKGLAREA_LIBS = $(GTKGLAREA)\gtkgl\gtkgl-$(GTKGLAREA_VER).lib
@@ -178,6 +179,9 @@ PNG_CFLAGS = -I $(DEVTOP)\include $(ZLIB_CFLAGS)
 PNG_LIBS = $(DEVTOP)\lib\libpng.lib  $(ZLIB_LIBS)
 !ENDIF
 
+LIBCROCO_CFLAGS = -I $(LIBCROCO)
+LIBCROCO_LIBS = -I $(LIBCROCO)\src\libcroco-0.0.lib
+
 RSVG_CFLAGS = -I $(RSVG)\..
 RSVG_LIBS = $(RSVG)\librsvg-2.lib
 
diff --git a/build/win32/module.defs b/build/win32/module.defs
index 1745c62..d55437e 100644
--- a/build/win32/module.defs
+++ b/build/win32/module.defs
@@ -39,7 +39,6 @@ DEVTOP=$(TOP)\..\other\dev
 # built using libtool.
 
 ATK_VER = 1.0
-CAIRO_VER = 1.4
 FREETYPE2_VER = 2.0
 GIMP_VER = 1.2
 GDK_PIXBUF_VER = 2.0
@@ -63,18 +62,21 @@ RSVG_VER = 2.4
 
 ATK = $(TOP)/atk
 BABL = $(TOP)/babl
-CAIRO = d:\devel\from-svn\other\cairo-1.8.4
+CAIRO = d:\devel\from-git\cairo
 GIMP = $(TOP)/gimp
 GEGL = $(TOP)/gegl
 GLIB = $(TOP)/glib
 GNOMECANVAS = $(TOP)\libgnomecanvas
 GNOMECANVAS_VER = 2.9
 
+GDK_PIXBUF = $(TOP)/gdk-pixbuf
+GDK_PIXBUF_VER = 2.0 
+
 # GTK+ 1.3.0, gtk-1-3-win32-production branch. Rename directory
 # to gtk+p after initial checkout from CVS.
 GTK = $(TOP)/gtk+p
 # GTK+ 2.0
-GTK2 = $(TOP)/gtk+
+GTK2 = $(TOP)/gtk-2-2x
 GTKSOURCEVIEW = $(TOP)/gtksourceview
 GNOMEPRINT = $(TOP)\libgnomeprint
 GNOMEPRINT_VER = 2.8
@@ -104,12 +106,16 @@ GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal
 GTKEXTRA = $(TOP)/gtk+extra
 GTKGLAREA = $(TOP)/gtkglarea
 #INTL = d:/devel/from-svn/other/intl-tml
-JPEG = d:/devel/from-svn/other/jpeg-6b
+#JPEG = d:/devel/from-svn/other/jpeg-6b
 LCMS = d:/devel/other/lcms-1.15
 LIBART = $(TOP)/libart_lgpl
 LIBICONV = $(TOP)/libiconv-$(LIBICONV_VER)
 LIBXSLT = $(TOP)/libxslt
 #PNG = d:/devel/from-svn/other/lpng1224
+# Only work with a trick whit unistalled version. Use:
+# 	junction src librcroco
+# in the checkout directory to have the headers avalibale for #include <libcroco/...>
+LIBCROCO = $(TOP)\libcroco
 RSVG = $(TOP)\librsvg
 SVG = $(TOP)\libsvg
 #TIFF = d:/devel/from-svn/other/tiff-3.7.2