summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-07-25 01:06:51 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-07-25 01:06:51 (GMT)
commit81fb0e33d6f869146934e760cd18044214ec825d (patch)
treeeea4c0ea4670460349c9766cb66ddbe65756109b /PCbuild
parent05338267ab75c0a0948049280da0224ecc2fb7dc (diff)
parent6ed63f31e9ca137b543cbaa5a7a61224c8a1e659 (diff)
downloadcpython-81fb0e33d6f869146934e760cd18044214ec825d.zip
cpython-81fb0e33d6f869146934e760cd18044214ec825d.tar.gz
cpython-81fb0e33d6f869146934e760cd18044214ec825d.tar.bz2
Merge from 3.5
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/pyproject.props2
1 files changed, 1 insertions, 1 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 05473fd..d1ac998 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -5,7 +5,7 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<OutDir>$(BuildPath)</OutDir>
<OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir>
- <Py_IntDir Condition="'$(PyIntDir)' == ''">$(SolutionDir)obj\</Py_IntDir>
+ <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir>
<IntDir>$(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(Py_IntDir)\$(ArchName)_PGO\$(ProjectName)\</IntDir>
<TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName>