Merge from 3.5
This commit is contained in:
commit
da27c1da85
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
Loading…
Reference in New Issue