From 5b3ea0f24cf6b9ad446d91714a3eda2da46efab6 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 29 Jul 2019 18:01:40 +0800 Subject: [PATCH] generate-msvc.mak: Generate gtk/gtkmarshalers.[c|h] Generate the marshaller sources in gtk/. This will indicate that all the sources that need to be generated in gtk/ are now generated for the MSVC projects, except for the ones that are generated by glib-mkenums. --- build/win32/generate-msvc.mak | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak index 4fb0b43b4c..e8fc81dfc3 100644 --- a/build/win32/generate-msvc.mak +++ b/build/win32/generate-msvc.mak @@ -36,6 +36,7 @@ GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32 GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers GDK_RESOURCES_ARGS = $** --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register +GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers GTK_RESOURCES_ARGS = $** --target=$@ --sourcedir=..\..\gtk --c-name _gtk --manual-register all: \ @@ -52,6 +53,8 @@ all: \ ..\..\gtk\gtkdbusgenerated.c \ ..\..\gtk\gtktypefuncs.inc \ ..\..\gtk\gtk.gresource.xml \ + ..\..\gtk\gtkmarshalers.h \ + ..\..\gtk\gtkmarshalers.c \ ..\..\gtk\gtkresources.h \ ..\..\gtk\gtkresources.c \ ..\..\demos\gtk-demo\demos.h @@ -168,11 +171,24 @@ all: \ @echo Generating $@... @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source +..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list + @echo Generating $@... + @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp + @move $@.tmp $@ + +..\..\gtk\gtkmarshalers.c: ..\..\gtk\gtkmarshalers.list + @echo Generating $@... + @echo #undef G_ENABLE_DEBUG> $@.tmp + @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp + @move $@.tmp $@ + # Remove the generated files clean: @-del /f /q ..\..\demos\gtk-demo\demos.h @-del /f /q ..\..\gtk\gtkresources.c @-del /f /q ..\..\gtk\gtkresources.h + @-del /f /q ..\..\gtk\gtkmarshalers.c + @-del /f /q ..\..\gtk\gtkmarshalers.h @-del /f /q ..\..\gtk\gtk.gresource.xml @-del /f /q ..\..\gtk\gtktypefuncs.inc @-del /f /q ..\..\gtk\gtkdbusgenerated.c