diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gdk/makefile.msc | 3 | ||||
| -rw-r--r-- | gtk/makefile.msc.in | 40 |
4 files changed, 48 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2006-01-05 Hans Breuer <hans@breuer.org> + + * gdk/makefile.msc : also recurse into win32 for ::clean + * gtk/makefile.msc.in : create gtkbuiltincache.h (most code + to simulate links) and file renames + 2006-01-05 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkprogressbar.c: Set minimum for activity-step property to 0 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 618dec94b2..67e08be969 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-01-05 Hans Breuer <hans@breuer.org> + + * gdk/makefile.msc : also recurse into win32 for ::clean + * gtk/makefile.msc.in : create gtkbuiltincache.h (most code + to simulate links) and file renames + 2006-01-05 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkprogressbar.c: Set minimum for activity-step property to 0 diff --git a/gdk/makefile.msc b/gdk/makefile.msc index bb8d147151..36a534227a 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -178,6 +178,9 @@ testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj $(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $< clean:: + cd win32 + nmake -f makefile.msc clean + cd .. del gdkmarshalers.c del gdkmarshalers.h del *.dll diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 3573c7fbe6..1dbc9f7a1d 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -41,15 +41,37 @@ DEFINES = \ TOUCH = copy makefile.msc+nul -gtk-stocks-icons : - cd stock-icons - nmake -nologo -f makefile.msc - cd .. +gtkbuiltincache.h: gtk-update-icon-cache.exe + cd stock-icons\16 + copy gtk-go-forward-ltr.png gtk-go-back-rtl.png + copy gtk-go-back-ltr.png gtk-go-forward-rtl.png + copy gtk-goto-last-ltr.png gtk-goto-first-rtl.png + copy gtk-goto-first-ltr.png gtk-goto-last-rtl.png + copy gtk-media-rewind-ltr.png gtk-media-forward-rtl.png + copy gtk-media-previous-ltr.png gtk-media-next-rtl.png + 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 + cd ..\24 + copy gtk-go-forward-ltr.png gtk-go-back-rtl.png + copy gtk-go-back-ltr.png gtk-go-forward-rtl.png + copy gtk-goto-last-ltr.png gtk-goto-first-rtl.png + copy gtk-goto-first-ltr.png gtk-goto-last-rtl.png + copy gtk-media-rewind-ltr.png gtk-media-forward-rtl.png + copy gtk-media-previous-ltr.png gtk-media-next-rtl.png + 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 + cd ..\.. + del gtkicontheme.obj + gtk-update-icon-cache --force --ignore-theme-index \ + --source builtin_icons stock-icons > gtkbuiltincache.h all : \ ..\config.h \ generated \ - gtk-stocks-icons \ + gtk-update-icon-cache.exe \ + gtkbuiltincache.h \ libgtk-win32-$(GTK_VER)-0.dll \ gtk-query-immodules-$(GTK_VER).exe \ # gtk-win32-$(GTK_VER)s.lib \ @@ -77,6 +99,7 @@ gtk_OBJECTS = \ gtkcelleditable.obj \ gtkcelllayout.obj \ gtkcellrenderer.obj \ + gtkcellrendereraccel.obj \ gtkcellrenderercombo.obj \ gtkcellrenderertext.obj \ gtkcellrenderertoggle.obj \ @@ -279,8 +302,8 @@ gtk_public_h_sources = \ gtkcelleditable.h \ gtkcelllayout.h \ gtkcellrenderer.h \ + gtkcellrendereraccel.h \ gtkcellrendererpixbuf.h \ - gtkcellrendererkeys.h \ gtkcellrenderertext.h \ gtkcellrenderertoggle.h \ gtkcellview.h \ @@ -526,12 +549,15 @@ gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS) gtk-query-immodules-$(GTK_VER).exe : queryimmodules.obj $(CC) $(CFLAGS) -Fe$@ queryimmodules.obj $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS) +gtk-update-icon-cache.exe : updateiconcache.obj + $(CC) $(CFLAGS) -Fe$@ updateiconcache.obj $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS) + gtk-x11-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def $(CC) $(CFLAGS) -LD -Fm -Fegtk-x11-$(GTK_VER).dll $(gtk_OBJECTS) ../gdk/gdk-x11-$(GTK_VER).lib $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def # General rule for compiling the objects into the DLL .c.obj : - $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $< + $(CC) $(CFLAGS) -Gf -Zm400 -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $< $(EXAMPLE).obj : ..\examples\$(EXAMPLE)\$(EXAMPLE).c $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(EXAMPLE)\" ..\examples\$(EXAMPLE)\$(EXAMPLE).c |