[gdk-pixbuf] build: Allow different Python installations per MSVC 201x projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] build: Allow different Python installations per MSVC 201x projects
- Date: Fri, 25 Aug 2017 08:34:17 +0000 (UTC)
commit 0926e545c837cf3922dac41863318cf439732801
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Aug 25 16:25:57 2017 +0800
build: Allow different Python installations per MSVC 201x projects
Make the Python release series used default to the following:
-Python 3.4.x for Visual Studio 2010, 2012 and 2013
-Python 3.6.x for Visual Studio 2015 and 2017
This is to make it in-line with what is used in GObject-Introspection,
as an MSVC subproject will be added shortly to enable building the
introspection files within the Visual Studio projects, so that we can
be more certain that we use the same Python installation that was used
to build GObject-Introspection. The defaults are selected in this
manner as the official CPython binaries on Windows are built with 2010
(3.4.x) and 2015 (3.6.x) respectively.
Note that the 2008 projects are not changed here as Python 2.7.x is the
only CPython version series that is built with 2008 and supports the
things in G-I fully, so the 2008 projects continues to default to a
Python 2.7.x installation.
win32/vs10/gdk-pixbuf-version-paths.props.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/win32/vs10/gdk-pixbuf-version-paths.props.in b/win32/vs10/gdk-pixbuf-version-paths.props.in
index 6bda226..1630edc 100644
--- a/win32/vs10/gdk-pixbuf-version-paths.props.in
+++ b/win32/vs10/gdk-pixbuf-version-paths.props.in
@@ -15,7 +15,11 @@
<GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
<GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
<GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
- <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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]