[gtk+/gtk-3-22] build: Prepare NMake Makefiles for MSVC project integration

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

commit e579245b1dd9e96d85d9c72cfb41fe1325a3b715
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Aug 28 16:15:11 2017 +0800

    build: Prepare NMake Makefiles for MSVC project integration
    
    The build/win32/detectenv-msvc.mak needs to be updated for Visual Studio
    2017, and we ought to add quotes to surround the copy destination path
    for the introspection files, so that we do not bail out in the copy
    process (cmd.exe's copy command does not like '+' in them that are not
    quoted).

 build/win32/detectenv-msvc.mak         |    4 +++-
 build/win32/gtk-introspection-msvc.mak |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak
index 61f979d..6fd96cc 100644
--- a/build/win32/detectenv-msvc.mak
+++ b/build/win32/detectenv-msvc.mak
@@ -40,8 +40,10 @@ VSVER = 10
 VSVER = 11
 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
 VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
 VSVER = 14
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+VSVER = 15
 !else
 VSVER = 0
 !endif
diff --git a/build/win32/gtk-introspection-msvc.mak b/build/win32/gtk-introspection-msvc.mak
index 2149650..6c44b64 100644
--- a/build/win32/gtk-introspection-msvc.mak
+++ b/build/win32/gtk-introspection-msvc.mak
@@ -29,9 +29,9 @@ setgirbuildenv:
 
 !include introspection.body.mak
 
-install-introspection: all 
-       @-copy *.gir $(G_IR_INCLUDEDIR)
-       @-copy /b *.typelib $(G_IR_TYPELIBDIR)
+install-introspection: all
+       @-copy *.gir "$(G_IR_INCLUDEDIR)"
+       @-copy /b *.typelib "$(G_IR_TYPELIBDIR)"
 
 !else
 all: