[gtk/gtk-3-24] generate-msvc.mak: Allow custom tools for glib-compile-resources

[Chun-wei Fan <fanchunwei src gnome org>]

commit c397fe420bcd88beda4c0451f7b42b52bdbd9f56
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 30 08:40:59 2019 +0800

    generate-msvc.mak: Allow custom tools for glib-compile-resources
    
    As some external tools are used by glib-compile-resources, such as
    xmllint, gdk-pixbuf-pixdata and (perhaps in the future)
    json-glib-format, allow people to pass in the full paths for them when
    invoking the NMake Makefiles to generate the various sources if they are
    not in the PATH or in where glib-compile-resources.exe is.

 build/win32/generate-msvc.mak | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak
index e8fc81dfc3..4bfbdef92b 100644
--- a/build/win32/generate-msvc.mak
+++ b/build/win32/generate-msvc.mak
@@ -104,10 +104,16 @@ all:      \
 
 ..\..\gdk\gdkresources.h: ..\..\gdk\gdk.gresource.xml
        @echo Generating $@...
+       @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+       @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+       @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
        @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
 
 ..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES)
        @echo Generating $@...
+       @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+       @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+       @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
        @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
 
 ..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
@@ -165,10 +171,16 @@ all:      \
 
 ..\..\gtk\gtkresources.h: ..\..\gtk\gtk.gresource.xml
        @echo Generating $@...
+       @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+       @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+       @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
        @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header
 
 ..\..\gtk\gtkresources.c: ..\..\gtk\gtk.gresource.xml
        @echo Generating $@...
+       @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+       @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+       @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
        @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source
 
 ..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list