traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.5

This commit is contained in:
Steve Dower 2016-07-13 19:58:47 -07:00
parent e824315e2b 945863a691
commit da27c1da85
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PCbuild/pcbuild.proj
View File

@ -33,8 +33,6 @@
<Projects Include="pythoncore.vcxproj"> <Projects Include="pythoncore.vcxproj">
<BuildInParallel>false</BuildInParallel> <BuildInParallel>false</BuildInParallel>
</Projects> </Projects>
<!-- python[w].exe -->
<Projects Include="python.vcxproj;pythonw.vcxproj" />
<!-- python3.dll --> <!-- python3.dll -->
<Projects Include="python3dll.vcxproj" /> <Projects Include="python3dll.vcxproj" />
<!-- py[w].exe --> <!-- py[w].exe -->
@ -58,12 +56,18 @@
<!-- Disable parallel build for test modules --> <!-- Disable parallel build for test modules -->
<BuildInParallel>false</BuildInParallel> <BuildInParallel>false</BuildInParallel>
</Projects> </Projects>
<!-- python[w].exe -->
<Projects Include="python.vcxproj;pythonw.vcxproj">
<BuildInParallel>false</BuildInParallel>
</Projects>
</ItemGroup> </ItemGroup>
<Target Name="Build"> <Target Name="Build">
<MSBuild Projects="@(Projects)" <MSBuild Projects="@(Projects)"
Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)" Properties="Configuration=%(Configuration);Platform=%(Platform);%(Properties)"
BuildInParallel="%(BuildInParallel)" BuildInParallel="%(BuildInParallel)"
StopOnFirstFailure="true"
Targets="%(BuildTarget)" /> Targets="%(BuildTarget)" />
</Target> </Target>

6
PCbuild/python3dll.vcxproj
View File

@ -58,6 +58,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_Machine>X86</_Machine> <_Machine>X86</_Machine>
<_Machine Condition="$(Platform) == 'x64'">X64</_Machine> <_Machine Condition="$(Platform) == 'x64'">X64</_Machine>
<ExtensionsToDeleteOnClean>$(ExtensionsToDeleteOnClean);$(IntDir)python3_d.def;$(IntDir)python3stub.def</ExtensionsToDeleteOnClean>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
@ -133,9 +134,4 @@
<MakeDir Directories="$(IntDir)" /> <MakeDir Directories="$(IntDir)" />
<WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" /> <WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true" />
</Target> </Target>
<Target Name="_CleanStubDef" BeforeTargets="CoreClean">
<ItemGroup>
<Clean Include="$(IntDir)python3stub.def" />
</ItemGroup>
</Target>
</Project> </Project>