diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 16:13:19 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 16:13:19 -0700 |
| commit | 181ce8cb33f65b4bd958f25b24ef4635969b02ba (patch) | |
| tree | 0bf01ec87e9bca2b6bd0c803a88e303f99ff5ec0 /PCbuild/pcbuild.proj | |
| parent | a9ae1d67054fc0a8ad272082c41919044d1c1e9c (diff) | |
| download | cpython-181ce8cb33f65b4bd958f25b24ef4635969b02ba.tar.gz | |
Fixes use of Py_IntDir and Py_OutDir to control build directories.
Diffstat (limited to 'PCbuild/pcbuild.proj')
| -rw-r--r-- | PCbuild/pcbuild.proj | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index a66184896a..b849783c8c 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -21,6 +21,15 @@ <CleanAllTarget>CleanAll</CleanAllTarget> <BuildInParallel>true</BuildInParallel> </Projects> + <Projects2> + <Platform>$(Platform)</Platform> + <Configuration>$(Configuration)</Configuration> + <Properties></Properties> + <BuildTarget>Build</BuildTarget> + <CleanTarget>Clean</CleanTarget> + <CleanAllTarget>CleanAll</CleanAllTarget> + <BuildInParallel>true</BuildInParallel> + </Projects2> </ItemDefinitionGroup> <ItemGroup> <!-- pythonXY.dll --> @@ -35,6 +44,8 @@ </Projects> <!-- python3.dll --> <Projects Include="python3dll.vcxproj" /> + <!-- pyshellext.dll --> + <Projects Include="pyshellext.vcxproj" /> <!-- py[w].exe --> <Projects Include="pylauncher.vcxproj;pywlauncher.vcxproj" /> <!-- _freeze_importlib --> @@ -58,9 +69,9 @@ </Projects> <!-- python[w].exe --> - <Projects Include="python.vcxproj;pythonw.vcxproj"> + <Projects2 Include="python.vcxproj;pythonw.vcxproj"> <BuildInParallel>false</BuildInParallel> - </Projects> + </Projects2> </ItemGroup> <Target Name="Build"> @@ -69,9 +80,20 @@ BuildInParallel="%(BuildInParallel)" StopOnFirstFailure="true" Targets="%(BuildTarget)" /> + <MSBuild Projects="@(Projects2)" + Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" + BuildInParallel="%(BuildInParallel)" + StopOnFirstFailure="true" + Targets="%(BuildTarget)" /> </Target> <Target Name="Clean"> + <MSBuild Projects="@(Projects2)" + Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" + BuildInParallel="%(BuildInParallel)" + StopOnFirstFailure="false" + Condition="%(CleanTarget) != ''" + Targets="%(CleanTarget)" /> <MSBuild Projects="@(Projects)" Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" BuildInParallel="%(BuildInParallel)" @@ -81,6 +103,12 @@ </Target> <Target Name="CleanAll"> + <MSBuild Projects="@(Projects2)" + Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" + BuildInParallel="%(BuildInParallel)" + StopOnFirstFailure="false" + Condition="%(CleanAllTarget) != ''" + Targets="%(CleanAllTarget)" /> <MSBuild Projects="@(Projects)" Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" BuildInParallel="%(BuildInParallel)" |