diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 23:13:19 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 23:13:19 (GMT) |
| commit | 6fd76bceda3fefc5e5814108c5fe819050613d33 (patch) | |
| tree | f8acf1d6f83647788e50ca1ad2b530b1a4f33560 /PCbuild/python.props | |
| parent | ff1d5ab16e6424cf000be314e3c5ca8e42ae43f4 (diff) | |
| download | cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.zip cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.tar.gz cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.tar.bz2 | |
Fixes use of Py_IntDir and Py_OutDir to control build directories.
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 843771d..ee70210 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -32,8 +32,13 @@ <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath> <!-- Directory where build outputs are put --> - <BuildPath Condition="'$(PyBuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath> - <BuildPath Condition="'$(PyBuildPath)' != ''">$(PyBuildPath)</BuildPath> + <BuildPath32 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCBuild\win32\</BuildPath32> + <BuildPath32 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\win32\</BuildPath32> + <BuildPath64 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCBuild\amd64\</BuildPath64> + <BuildPath64 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\amd64\</BuildPath64> + <BuildPath Condition="'$(ArchName)' == 'win32'">$(BuildPath32)</BuildPath> + <BuildPath Condition="'$(ArchName)' == 'amd64'">$(BuildPath64)</BuildPath> + <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <!-- Directories of external projects. tcltk is handled in tcltk.props --> |