From b97ccecd5d1cce39857ac6e07635c58e80cddacb Mon Sep 17 00:00:00 2001
From: Hans Breuer <hans@breuer.org>
Date: Sun, 12 Jul 2009 17:57:13 +0200
Subject: [PATCH] Update msvc build

---
 gdk/win32/makefile.msc | 10 +++++-----
 gtk/makefile.msc.in    |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index cb6ba5d0a5..5a4fa418f3 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -16,10 +16,13 @@ WTKIT = $(TOP)\wtkit126
 
 GTK_VER=2.0
 
-CFLAGS = -FImsvc_recommended_pragmas.h \
+DEFINES = \
+	-DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\" \
+	-DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\"
+
+INCLUDES = -FImsvc_recommended_pragmas.h \
 	-I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \
 	-I$(WTKIT)\include -I$(GLIB) \
-	$(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\"
 
 all: \
 	..\..\config.h	\
@@ -68,9 +71,6 @@ gdk.res : rc\gdk.rc
 gdk-win32.lib : $(gdk_win32_OBJECTS)
 	lib -out:gdk-win32.lib $(gdk_win32_OBJECTS)
 
-.c.obj :
-	$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
-
 clean::
 	del *.obj
 	del *.lib
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 6656fc8a87..0227fa7f0f 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -235,6 +235,7 @@ gtk_OBJECTS = \
 	gtkdrawingarea.obj \
 	gtkeditable.obj \
 	gtkentry.obj \
+	gtkentrybuffer.obj \
 	gtkentrycompletion.obj \
 	gtkeventbox.obj \
 	gtkexpander.obj \
@@ -285,6 +286,7 @@ gtk_OBJECTS = \
 	gtkmnemonichash.obj \
 	gtkmodules.obj \
 	gtkmountoperation.obj \
+	gtkmountoperation-stub.obj \
 	gtknotebook.obj \
 	gtkobject.obj \
 	gtkorientable.obj \
@@ -406,6 +408,7 @@ gtk_public_h_sources =		\
 	gtkdrawingarea.h	\
 	gtkeditable.h           \
 	gtkentry.h		\
+	gtkentrybuffer.h	\
 	gtkentrycompletion.h	\
 	gtkenums.h		\
 	gtkeventbox.h		\