[glib] MSVC 201x builds: Allow different Python versions per toolset



commit 7d64d109f0d78ba683df1122ddfadd5ace3e9143
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 12 18:18:28 2017 +0800

    MSVC 201x builds: Allow different Python versions per toolset
    
    Use conditionals to select the Python installation, so that we can more
    stick to the default Visual Studio versions used to compile each
    official Python releases more closely.
    
    This means by default:
    -2010/2012/2013 builds use Python 3.4.x, which is built with 2010
    -2015/2017 builds use Python 3.6.x, which is built with 2015

 win32/vs10/glib-version-paths.props.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in
index 468e558..df19f39 100644
--- a/win32/vs10/glib-version-paths.props.in
+++ b/win32/vs10/glib-version-paths.props.in
@@ -12,7 +12,11 @@
     <GlibSeparateVSDllSuffix>-2-vs$(VSVer)</GlibSeparateVSDllSuffix>
     <GlibDllPrefix>$(GlibSeparateVSDllPrefix)</GlibDllPrefix>
     <GlibDllSuffix>$(GlibSeparateVSDllSuffix)</GlibDllSuffix>
-    <PythonPath>c:\python27</PythonPath>
+    <PythonPath Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonPath>
+    <PythonPath Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonPath>
+    <PythonPath Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonPath>
+    <PythonPath Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonPath>
+    <PythonPath Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonPath>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibversionpathsprops</_PropertySheetDisplayName>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]