From 0e781823cb76f4962c2d1e46fd494def178938b0 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 27 Aug 2010 20:34:23 +0200 Subject: [PATCH] Update mscv/win32 build Fix makefiles for separated gdk-pixbuf and declare variable at the beginning of a block (fix c99ism). --- gdk/makefile.msc | 5 ++--- gdk/win32/makefile.msc | 3 ++- gtk/gtkrange.c | 3 +-- gtk/makefile.msc.in | 17 ++++++++++++++--- makefile.msc | 2 +- tests/makefile.msc | 10 +++++----- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/gdk/makefile.msc b/gdk/makefile.msc index ded0aa277..e9f816931 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -28,7 +28,7 @@ PERL = perl INCLUDES = -FImsvc_recommended_pragmas.h \ -I . -I .. \ - $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) -I ../gdk-pixbuf \ + $(GLIB_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) -I ../gdk-pixbuf \ DEFINES = \ -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \ @@ -38,8 +38,7 @@ DEFINES = \ EXTRALIBS = \ $(WTKIT)\lib\i386\wntab32x.lib \ - $(GLIB_LIBS) \ - ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ + $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) \ $(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \ $(PANGOCAIRO_LIBS) diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index 5a4fa418f..7a8828463 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -21,7 +21,8 @@ DEFINES = \ -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" INCLUDES = -FImsvc_recommended_pragmas.h \ - -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \ + -I. -I.. -I..\.. $(GLIB_CFLAGS) $(GDK_PIXBUF_CFLAGS) \ + $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \ -I$(WTKIT)\include -I$(GLIB) \ all: \ diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 82ef2d63e..bb13eb596 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -1696,6 +1696,7 @@ draw_stepper (GtkRange *range, gint arrow_y; gint arrow_width; gint arrow_height; + gboolean arrow_sensitive = TRUE; switch (stepper) { @@ -1715,8 +1716,6 @@ draw_stepper (GtkRange *range, g_assert_not_reached (); }; - gboolean arrow_sensitive = TRUE; - /* More to get the right clip region than for efficiency */ if (!gdk_rectangle_intersect (area, rect, &intersection)) return; diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index bb6ac9999..469cf46f6 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -16,7 +16,6 @@ GDK_PIXBUF_VER = 2.0 GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib GTK_LIBS = gtk-win32-$(GTK_VER).lib -GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ # Perl and awk are needed to generate some source files. @@ -25,7 +24,7 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ PERL = perl AWK = gawk -INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf +INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk $(GDK_PIXBUF_CFLAGS) DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) @@ -127,11 +126,12 @@ gtk_OBJECTS_cell = \ gtkcellrenderer.obj \ gtkcellrendereraccel.obj \ gtkcellrenderercombo.obj \ + gtkcellrendererspin.obj \ + gtkcellrendererspinner.obj \ gtkcellrenderertext.obj \ gtkcellrenderertoggle.obj \ gtkcellrendererpixbuf.obj \ gtkcellrendererprogress.obj \ - gtkcellrendererspin.obj \ gtkcellview.obj \ gtkliststore.obj \ gtktreednd.obj \ @@ -289,9 +289,11 @@ gtk_OBJECTS = \ gtkmountoperation-stub.obj \ gtknotebook.obj \ gtkobject.obj \ + gtkoffscreenwindow.obj \ gtkorientable.obj \ gtkpagesetup.obj \ gtkpaned.obj \ + gtkpango.obj \ gtkpapersize.obj \ gtkpathbar.obj \ gtkplug.obj \ @@ -322,6 +324,7 @@ gtk_OBJECTS = \ gtksocket.obj \ gtksocket-win32.obj \ gtkspinbutton.obj \ + gtkspinner.obj \ gtkstatusicon.obj \ gtkstyle.obj \ gtkstatusbar.obj \ @@ -334,6 +337,8 @@ gtk_OBJECTS = \ gtktoggletoolbutton.obj \ gtktoolbutton.obj \ gtktoolitem.obj \ + gtktoolitemgroup.obj \ + gtktoolpalette.obj \ gtktoolshell.obj \ gtktooltip.obj \ gtktreedatalist.obj \ @@ -386,6 +391,7 @@ gtk_public_h_sources = \ gtkcellrendererpixbuf.h \ gtkcellrendererprogress.h \ gtkcellrendererspin.h \ + gtkcellrendererspinner.h \ gtkcellrenderertext.h \ gtkcellrenderertoggle.h \ gtkcellview.h \ @@ -464,10 +470,12 @@ gtk_public_h_sources = \ gtkmountoperation.h \ gtknotebook.h \ gtkobject.h \ + gtkoffscreenwindow.h \ gtkoldeditable.h \ gtkoptionmenu.h \ gtkpagesetup.h \ gtkpaned.h \ + gtkpango.h \ gtkpapersize.h \ gtkpixmap.h \ gtkplug.h \ @@ -506,6 +514,7 @@ gtk_public_h_sources = \ gtksizegroup.h \ gtksocket.h \ gtkspinbutton.h \ + gtkspinner.h \ gtkstatusbar.h \ gtkstatusicon.h \ gtkstock.h \ @@ -529,6 +538,8 @@ gtk_public_h_sources = \ gtktoolbar.h \ gtktoolbutton.h \ gtktoolitem.h \ + gtktoolitemgroup.h \ + gtktoolpalette.h \ gtktooltip.h \ gtktooltips.h \ gtktree.h \ diff --git a/makefile.msc b/makefile.msc index f95e5d33e..3af6b7c91 100644 --- a/makefile.msc +++ b/makefile.msc @@ -1,7 +1,7 @@ ## Makefile for building the Gtk+ dlls with Microsoft C ## Use: nmake -f makefile.msc -PARTS = gdk-pixbuf gdk gtk tests +PARTS = gdk gtk tests all : \ config.h \ diff --git a/tests/makefile.msc b/tests/makefile.msc index 9b097a70f..468d27adf 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -15,10 +15,10 @@ 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 = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk -DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) +INCLUDES = -I . -I .. -I ../gdk -I ../gtk +DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(GDK_PIXBUF_CFLAGS) \ + $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) LDFLAGS = /link /machine:ix86 $(LINKDEBUG) DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" @@ -54,7 +54,7 @@ TESTAPPS = \ testicontheme testiconview testimage testinput \ testmenus testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \ testnouiprint testnotebookdnd \ - testoffscreen testorientable \ + testoffscreen testoffscreenwindow testorientable \ testprint \ testrecentchooser testrecentchoosermenu testrgb testrichtext \ testscale testselection testspinbutton \ @@ -110,7 +110,7 @@ EXTRA_OBJETCS = testsocket_common.obj $(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ - $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) + $(PANGO_LIBS) $(PANGOCAIRO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) $(TESTAPP).obj : $(TESTAPP).c $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c