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 /Tools/msi/msi.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 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 9ae6d99..0cf7c77 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -47,7 +47,7 @@ </ItemGroup> <PropertyGroup> - <IntermediateOutputPath>$(PySourcePath)PCBuild\obj\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath> + <IntermediateOutputPath>$(Py_IntDir)\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath> <IntermediateOutputPath Condition="'$(OutputSuffix)' != ''">$(IntermediateOutputPath)_$(OutputSuffix)</IntermediateOutputPath> <OutputPath Condition="'$(OutputPath)' == ''">$(BuildPath)</OutputPath> <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath> @@ -124,6 +124,12 @@ <LinkerBindInputPaths Include="$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT"> <BindName>redist</BindName> </LinkerBindInputPaths> + <LinkerBindInputPaths Include="$(BuildPath32)"> + <BindName>build32</BindName> + </LinkerBindInputPaths> + <LinkerBindInputPaths Include="$(BuildPath64)"> + <BindName>build64</BindName> + </LinkerBindInputPaths> </ItemGroup> <Target Name="_ValidateMsiProps" BeforeTargets="PrepareForBuild"> |