summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2017-07-12 18:24:45 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2017-07-12 18:24:45 +0800
commitc6fce971dac5bafa8485fe477a37b40c6dde960f (patch)
tree899990c353b30cb53ecd2d62197954dad062c21c
parentf6fe3d9b575d815ecc6558ac000f808be00e7f77 (diff)
downloadgobject-introspection-c6fce971dac5bafa8485fe477a37b40c6dde960f.tar.gz
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
-rw-r--r--win32/vs10/gi-version-paths.props.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/win32/vs10/gi-version-paths.props.in b/win32/vs10/gi-version-paths.props.in
index 4936c4e0..5793455d 100644
--- a/win32/vs10/gi-version-paths.props.in
+++ b/win32/vs10/gi-version-paths.props.in
@@ -5,7 +5,11 @@
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
- <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 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
<PythonDirX64>$(PythonDir).x64</PythonDirX64>
<IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>