From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 28 Aug 2017 08:15:11 +0000 (+0800)
Subject: build: Prepare NMake Makefiles for MSVC project integration
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~303
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e579245b1dd9e96d85d9c72cfb41fe1325a3b715;p=gtk%2B3.0.git

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 61f979d4eb..6fd96ccc65 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 2149650a52..6c44b64323 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: