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).

diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak
index 61f979d4eb3693ee5738fd296e91c6ebe5fd0d5b..6fd96ccc65acb3aa22416106382e5eb2a3031b8b 100644 (file)
--- 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 2149650a52f0b88d5ab17940c5076ee05ed63c2f..6c44b643236b038ca10adea8cba39d2686d4e25e 100644 (file)
--- 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: