diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-07-13 17:31:07 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-07-13 17:31:07 +0800 |
| commit | 62769abbe997022db2cb6539dd2fef08acefe243 (patch) | |
| tree | 13d6a94c3444cca0ffafa19bce8c28f9a860cd31 /win32/vs10/atk-version-paths.props.in | |
| parent | 4266822d4b5227b55706993840a913fb6b15b2cd (diff) | |
| download | atk-62769abbe997022db2cb6539dd2fef08acefe243.tar.gz | |
MSVC Builds: Use PythonDir instead of PythonPath
If someone is building using MSBuild, we want to make sure that we do
not use an envvar that would also determine where the Python modules are
loaded.
Also, allow different Python paths depending on the Visual Studio
version that is being used for Visual Studio 201x builds, to better suit
the version of Visual Studio that is used to build the official
releases of Python, which means the default is as follows:
-Visual Studio 2010, 2012, 2013: Python 3.4.x, which is built with 2010
-Visual Studio 2015 and 2017: Python 3.6.x, which is built with 2015.
Diffstat (limited to 'win32/vs10/atk-version-paths.props.in')
| -rw-r--r-- | win32/vs10/atk-version-paths.props.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/win32/vs10/atk-version-paths.props.in b/win32/vs10/atk-version-paths.props.in index 6cdbefa..1347ad2 100644 --- a/win32/vs10/atk-version-paths.props.in +++ b/win32/vs10/atk-version-paths.props.in @@ -14,8 +14,12 @@ <AtkSeparateVSDllSuffix>-1-vs$(VSVer)</AtkSeparateVSDllSuffix> <AtkDllPrefix>$(AtkSeparateVSDllPrefix)</AtkDllPrefix> <AtkDllSuffix>$(AtkSeparateVSDllSuffix)</AtkDllSuffix> - <PythonPath>c:\python34</PythonPath> - <PythonPathX64>$(PythonPath).x64</PythonPathX64> + <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> <_PropertySheetDisplayName>atkversionpathsprops</_PropertySheetDisplayName> @@ -57,11 +61,11 @@ <BuildMacro Include="AtkDllSuffix"> <Value>$(AtkDllSuffix)</Value> </BuildMacro> - <BuildMacro Include="PythonPath"> - <Value>$(PythonPath)</Value> + <BuildMacro Include="PythonDir"> + <Value>$(PythonDir)</Value> </BuildMacro> - <BuildMacro Include="PythonPathX64"> - <Value>$(PythonPathX64)</Value> + <BuildMacro Include="PythonDirX64"> + <Value>$(PythonDirX64)</Value> </BuildMacro> </ItemGroup> </Project> |