diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-07-14 02:58:47 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-07-14 02:58:47 (GMT) |
| commit | da27c1da8547c0deaab653e8a1818c7e313be8bd (patch) | |
| tree | 03d23baed6b3b8823a9baed8973f24b5187f45d3 /PCbuild | |
| parent | e824315e2b17b6d82c9c5f64b044369cd1f0b8a9 (diff) | |
| parent | 945863a691275a7088a4a9227bb35791390ec02a (diff) | |
| download | cpython-da27c1da8547c0deaab653e8a1818c7e313be8bd.zip cpython-da27c1da8547c0deaab653e8a1818c7e313be8bd.tar.gz cpython-da27c1da8547c0deaab653e8a1818c7e313be8bd.tar.bz2 | |
Merge from 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pcbuild.proj | 8 | ||||
| -rw-r--r-- | PCbuild/python3dll.vcxproj | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index 36621c9..a661848 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -33,8 +33,6 @@ <Projects Include="pythoncore.vcxproj"> <BuildInParallel>false</BuildInParallel> </Projects> - <!-- python[w].exe --> - <Projects Include="python.vcxproj;pythonw.vcxproj" /> <!-- python3.dll --> <Projects Include="python3dll.vcxproj" /> <!-- py[w].exe --> @@ -58,12 +56,18 @@ <!-- Disable parallel build for test modules --> <BuildInParallel>false</BuildInParallel> </Projects> + + <!-- python[w].exe --> + <Projects Include="python.vcxproj;pythonw.vcxproj"> + <BuildInParallel>false</BuildInParallel> + </Projects> </ItemGroup> <Target Name="Build"> <MSBuild Projects="@(Projects)" Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" BuildInParallel="%(BuildInParallel)" + StopOnFirstFailure="true" Targets="%(BuildTarget)" /> </Target> diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj index cbb618f..c66c8ef 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -58,6 +58,7 @@ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_Machine>X86</_Machine> <_Machine Condition="$(Platform) == 'x64'">X64</_Machine> + <ExtensionsToDeleteOnClean>$(ExtensionsToDeleteOnClean);$(IntDir)python3_d.def;$(IntDir)python3stub.def</ExtensionsToDeleteOnClean> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> @@ -133,9 +134,4 @@ <MakeDir Directories="$(IntDir)" /> <WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" /> </Target> - <Target Name="_CleanStubDef" BeforeTargets="CoreClean"> - <ItemGroup> - <Clean Include="$(IntDir)python3stub.def" /> - </ItemGroup> - </Target> </Project>
\ No newline at end of file |