From fbf73aada929f760d0875f4bccf326841964eb09 Mon Sep 17 00:00:00 2001
From: Hans Breuer <hans@breuer.org>
Date: Wed, 1 Jul 2009 21:32:46 +0200
Subject: Updated msvc build

---
 gdk-pixbuf/makefile.msc |  3 ++-
 gdk/makefile.msc        |  2 +-
 gtk/makefile.msc.in     | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index 62020f4ea0..7f6486afa1 100644
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -15,11 +15,12 @@ GDK_PIXBUF_VER = 2.0
 # but not yet -DINCLUDE_png 
 ##USEGDIP=1
 # to get _working_ include modules we need respective defines ...
+#   
 BUILT_IN_FORMATS = \
 !IFDEF USEGDIP
 	-DINCLUDE_gdiplus \
 !ELSE
-	-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff \
+	-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \
 !ENDIF
 	-DINCLUDE_png \
 	-DINCLUDE_xpm -DINCLUDE_wbmp \
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 35e6467237..5e4d55d965 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -52,7 +52,7 @@ EXTRALIBS = \
 	$(WTKIT)\lib\i386\wntab32x.lib \
 	$(GLIB_LIBS) \
 	..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
-	$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
+	$(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
 	$(PANGOCAIRO_LIBS)
 
 gdk-win32-backend :
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 83aa1b8657..45b1e8acf8 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -55,6 +55,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
 	copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
 	copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
 	copy gtk-floppy.png gtk-save.png
+	copy gtk-harddisk.png drive-harddisk.png
+	copy gtk-directory.png folder.png
+	copy gtk-directory.png folder-remote.png
+	copy gtk-home.png user-home.png
+	copy gtk-directory.png user-desktop.png
+	copy gtk-file.png text-x-generic.png
 	cd ..\24
 	copy gtk-go-forward-ltr.png gtk-go-back-rtl.png
 	copy gtk-go-back-ltr.png gtk-go-forward-rtl.png
@@ -65,6 +71,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
 	copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
 	copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
 	copy gtk-floppy.png gtk-save.png
+	copy gtk-harddisk.png drive-harddisk.png
+	copy gtk-directory.png folder.png
+	copy gtk-directory.png folder-remote.png
+	copy gtk-home.png user-home.png
+	copy gtk-directory.png user-desktop.png
+	copy gtk-file.png text-x-generic.png
 	cd ..\..
 	del gtkicontheme.obj
 	gtk-update-icon-cache --force --ignore-theme-index 	\
@@ -101,6 +113,7 @@ gtk_OBJECTS_deprecated = \
 	gtklistitem.obj \
 	gtkprogress.obj \
 	gtktipsquery.obj \
+	gtkshow.obj \
 	gtksignal.obj \
 	gtkpixmap.obj \
 	gtkpreview.obj \
@@ -144,7 +157,6 @@ gtk_OBJECTS_file = \
 	gtkfilefilter.obj \
 	gtkfilesystem.obj \
 	gtkfilesystemmodel.obj \
-	gtkfilesystemwin32.obj \
 
 gtk_OBJECTS_print = \
 	gtkprint-win32.obj \
@@ -193,6 +205,7 @@ gtk_OBJECTS = \
 	gtkaccessible.obj \
 	gtkaction.obj \
 	gtkactiongroup.obj \
+	gtkactivatable.obj \
 	gtkadjustment.obj \
 	gtkalignment.obj \
 	gtkarrow.obj \
@@ -273,6 +286,7 @@ gtk_OBJECTS = \
 	gtkmountoperation.obj \
 	gtknotebook.obj \
 	gtkobject.obj \
+	gtkorientable.obj \
 	gtkpagesetup.obj \
 	gtkpaned.obj \
 	gtkpapersize.obj \
@@ -347,6 +361,7 @@ gtk_public_h_sources =		\
 	gtkaccessible.h		\
 	gtkaction.h		\
 	gtkactiongroup.h	\
+	gtkactivatable.h	\
 	gtkadjustment.h		\
 	gtkalignment.h		\
 	gtkarrow.h		\
-- 
cgit v1.2.1