[gtk/gtk-3-24] builds: Fix introspection with MSVC builds

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

commit 5d903cb094505d653585fcc9b3ec46d313858d3f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 11 18:13:10 2018 +0800

    builds: Fix introspection with MSVC builds
    
    For building the introspection dumper program on Visual Studio, leave out
    the G_LOG_DOMAIN as g-ir-scanner does not like it when it constructs the
    compiler command line for Visual Studio.
    
    Also ensure that we are looking for the freshly-built libraries by looking
    for the .lib's from the output directories of the Visual Studio project files.

 build/Makefile.msvc-introspection | 1 +
 gdk/Makefile.am                   | 2 +-
 gtk/Makefile.am                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/build/Makefile.msvc-introspection b/build/Makefile.msvc-introspection
index 6c9096436f..16cf7dda31 100644
--- a/build/Makefile.msvc-introspection
+++ b/build/Makefile.msvc-introspection
@@ -109,6 +109,7 @@ $(top_builddir)/build/win32/$(1).msvc.introspect:
        echo '  --cflags-end    \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
        echo '  '$($(_gir_name)_MSVC_SCANNERFLAGS)'     \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
        echo '  --filelist='$(_gir_name)'_list  \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+       echo '  -L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin      
\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
        echo '  -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
        echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 573b1974ae..9550187a8b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -34,12 +34,12 @@ EXTRA_DIST +=                       \
        gdkversionmacros.h.in
 
 GDK_CFLAGS_DEFINES =   \
-       -DG_LOG_DOMAIN=\"Gdk\"          \
        -DG_LOG_USE_STRUCTURED=1        \
        -DGDK_COMPILATION
 
 
 AM_CPPFLAGS =                          \
+       -DG_LOG_DOMAIN=\"Gdk\"          \
        $(GDK_CFLAGS_DEFINES)           \
        -I$(top_builddir)               \
        -I$(top_builddir)/gdk           \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index dc05ac54d8..559442963e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 include $(top_srcdir)/Makefile.decl
 
 GTK_BASE_CFLAGS_DEFINES =                              \
-       -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DG_LOG_USE_STRUCTURED=1                        \
        -DGTK_VERSION=\"$(GTK_VERSION)\"                \
        -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
@@ -20,6 +19,7 @@ GTK_PLAT_CFLAGS_DEFINES =                             \
        -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"
 
 AM_CPPFLAGS =                                          \
+       -DG_LOG_DOMAIN=\"Gtk\"                          \
        $(GTK_BASE_CFLAGS_DEFINES)                      \
        $(GTK_PLAT_CFLAGS_DEFINES)                      \
        -DX11_DATA_PREFIX=\"$(X11_PREFIX)\"             \