From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 28 Aug 2017 07:01:55 +0000 (+0800)
Subject: build: Set PythonDir according to MSVC version in projects
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~304
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24fd61512beb6ee38a95b9774eeb184e9b1ecb6d;p=gtk%2B3.0.git

build: Set PythonDir according to MSVC version in projects

This is to make this more in-line with what is in the G-I projects, so
that we could use this to build the introspection files for GTK+-3.22.x
directly from the project files.  This is intended to follow the MSVC
versions used to build the official CPython Windows binaries, i.e.:
-3.3.x, 3.4.x: for MSVC 2010, 2012, 2013, which is built with 2010
-3.5.x, 3.6.x: for 2015 and 2017, which is built with 2015.
---

diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk3-version-paths.props.in
index cf35781a7b..b5f7a098e9 100644
--- a/build/win32/vs10/gtk3-version-paths.props.in
+++ b/build/win32/vs10/gtk3-version-paths.props.in
@@ -12,7 +12,11 @@
     <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir>c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonDir>
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
   </PropertyGroup>
   <PropertyGroup>