Update msvc build

diff --git a/demos/gtk-demo/makefile.msc.in b/demos/gtk-demo/makefile.msc.in
index f4d857c610860cd07f2270bfcfd13fb75d49982a..a92362f3afa620301c1e6261fae81b6e9f9d9d08 100644 (file)
--- a/demos/gtk-demo/makefile.msc.in
+++ b/demos/gtk-demo/makefile.msc.in
@@ -14,15 +14,15 @@ PERL = perl
 ################################################################
 
 # Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
+GTK_VER = 2.0
+GDK_PIXBUF_VER = 2.0
 
 GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
 GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
 GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
 
 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
        -DDEMOCODEDIR=\".\"
@@ -90,5 +90,6 @@ OBJECTS = \
        main.obj \
 
 gtk-demo.exe : demos.h $(OBJECTS)
-       $(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+       $(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+       $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index d8830fb2c9982c86be6d37f487f00e25981e7e33..e891c1f0858b3b2c4b8cee87fe2a718d743291e5 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -130,6 +130,7 @@ gtk_OBJECTS_cell = \
        gtkcellrendererpixbuf.obj \
        gtkcellrendererprogress.obj \
        gtkcellrendererspin.obj \
+       gtkcellrendererspinner.obj \
        gtkcellview.obj \
        gtkliststore.obj \
        gtktreednd.obj \
@@ -287,6 +288,7 @@ gtk_OBJECTS = \
        gtkmountoperation-stub.obj \
        gtknotebook.obj \
        gtkobject.obj \
+       gtkoffscreenwindow.obj \
        gtkorientable.obj \
        gtkpagesetup.obj \
        gtkpaned.obj \
@@ -320,6 +322,7 @@ gtk_OBJECTS = \
        gtksocket.obj \
        gtksocket-win32.obj \
        gtkspinbutton.obj \
+       gtkspinner.obj \
        gtkstatusicon.obj \
        gtkstyle.obj \
        gtkstatusbar.obj \
@@ -332,6 +335,8 @@ gtk_OBJECTS = \
        gtktoggletoolbutton.obj \
        gtktoolbutton.obj \
        gtktoolitem.obj \
+       gtktoolitemgroup.obj \
+       gtktoolpalette.obj \
        gtktoolshell.obj \
        gtktooltip.obj \
        gtktreedatalist.obj \
@@ -384,6 +389,7 @@ gtk_public_h_sources =              \
        gtkcellrendererpixbuf.h \
        gtkcellrendererprogress.h \
        gtkcellrendererspin.h   \
+       gtkcellrendererspinner.h \
        gtkcellrenderertext.h   \
        gtkcellrenderertoggle.h \
        gtkcellview.h           \
@@ -462,6 +468,7 @@ gtk_public_h_sources =              \
        gtkmountoperation.h     \
        gtknotebook.h           \
        gtkobject.h             \
+       gtkoffscreenwindow.h    \
        gtkoldeditable.h        \
        gtkoptionmenu.h         \
        gtkpagesetup.h          \
@@ -502,6 +509,7 @@ gtk_public_h_sources =              \
        gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
+       gtkspinner.h            \
        gtkstatusbar.h          \
        gtkstatusicon.h         \
        gtkstock.h              \
@@ -525,6 +533,8 @@ gtk_public_h_sources =              \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolitemgroup.h              \
+       gtktoolpalette.h        \
        gtktooltip.h            \
        gtktooltips.h           \
        gtktree.h               \