Update msvc build

diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index cb6ba5d0a5306d37cdc7f8e58ba134a3cf22a406..5a4fa418f39f1c89bc0cfffb660f98588c82e6dd 100644 (file)
--- 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 6656fc8a8732d7e28d441323996f4692e5dee6cc..0227fa7f0fe3d86a2ee7f0071fdd59d85229d7ed 100644 (file)
--- 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           \