diff options
| author | Hans Breuer <hans@breuer.org> | 2002-03-03 15:04:56 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2002-03-03 15:04:56 +0000 |
| commit | 751705f9f0b829917aa8544d65a2f0b1b8e62ee5 (patch) | |
| tree | 71da24e420f241598c97474ebcaaccd4959dabb5 /gtk/makefile.msc.in | |
| parent | 32dea2dbdc436e69c47f9365d9b87091681a0568 (diff) | |
| download | gdk-pixbuf-751705f9f0b829917aa8544d65a2f0b1b8e62ee5.tar.gz | |
make rewrite_event_for_window() static gtk_rc_clear_realized_style()
2002-03-03 Hans Breuer <hans@breuer.org>
* gtk/gtkmain.c : make rewrite_event_for_window() static
* gtk/gtkrc.c : gtk_rc_clear_realized_style() static
* gtk/makefile.msc.in : adapt to makeenums build changes
* gtk.def : sorted alphabetical again
Diffstat (limited to 'gtk/makefile.msc.in')
| -rw-r--r-- | gtk/makefile.msc.in | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 0ca53d29d..eb6fec9f9 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -193,6 +193,7 @@ gtk_OBJECTS = \ gtktreeview.obj \ gtktreeviewcolumn.obj \ gtktypeutils.obj \ + gtktypebuiltins.obj \ gtkvbbox.obj \ gtkvbox.obj \ gtkviewport.obj \ @@ -349,15 +350,13 @@ gtk_public_h_sources = \ # these aren't use here, but listed for reference gtk_extra_sources = \ gtkversion.h \ - maketypes.awk \ - makeenums.h \ gtk-boxed.defs \ gtkmarshal.list \ ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h -GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c +GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c # # Generated source files: @@ -365,26 +364,38 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id generated : $(GENERATED) $(TOUCH) generated -gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) makefile.msc - $(PERL) makeenums.pl defs $(gtk_public_h_sources) >gd.tmp - copy gd.tmp+gtk-boxed.defs gtk.defs - @erase gd.tmp +gtk.defs : gtk-boxed.defs $(gtk_public_h_sources) makefile.msc + $(PERL) $(GLIB)\gobject\glib-mkenums \ + --comments ";; @comment@" \ + --fprod "; enumerations from \"@filename@\"\n " \ + --vhead "(define-@type@ @EnumName@" \ + --vprod " (@valuenick@ @VALUENAME@)" \ + --vtail ")" \ + $(gtk_public_h_sources) > xgen-gdef + copy xgen-gdef+gtk-boxed.defs gtk.defs # generate type identifier header (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins.h: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h - -# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins_vars.c: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c - -# generate type entries for type-id registration -gtktypebuiltins_ids.c: gtk.defs maketypes.awk - $(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c - -# generate enum value arrays -gtktypebuiltins_evals.c: makeenums.pl gtk.defs - $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c +# use 'echo' to work around 'command line too long' +gtktypebuiltins.h: $(gtk_public_h_sources) makefile.msc + echo #ifndef __GTK_TYPE_BUILTINS_H__ > gtktypebuiltins.h + echo #define __GTK_TYPE_BUILTINS_H__ >> gtktypebuiltins.h + echo #include "glib-object.h" >> gtktypebuiltins.h + echo G_BEGIN_DECLS >> gtktypebuiltins.h + $(PERL) $(GLIB)\gobject\glib-mkenums \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \ + $(gtk_public_h_sources) >> gtktypebuiltins.h + +gtktypebuiltins.c: $(gtk_public_h_sources) makefile.msc + $(PERL) $(GLIB)\gobject\glib-mkenums \ + --fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $(gtk_public_h_sources) > xgen-gtbc + copy xgen-gtbc gtktypebuiltins.c # private marshalers gtkmarshalers.h : gtkmarshalers.list |