diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-27 21:59:00 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-27 21:59:00 (GMT) |
| commit | 9c11d91b5089bba386751a9d0ba88377f5b4321f (patch) | |
| tree | b33777285dbcb4aadf28b3623ff9e222f8c5a903 /PCbuild | |
| parent | 639f42115d3aa0127ddb444e5e31e87d06178c2e (diff) | |
| parent | de9fb28bf1a1d506916c34a5e4858807dc1f9575 (diff) | |
| download | cpython-9c11d91b5089bba386751a9d0ba88377f5b4321f.zip cpython-9c11d91b5089bba386751a9d0ba88377f5b4321f.tar.gz cpython-9c11d91b5089bba386751a9d0ba88377f5b4321f.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/openssl.props | 6 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 10 | ||||
| -rw-r--r-- | PCbuild/python.props | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index d4ef7ac..d094e59 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(opensslDir)tmp\</Py_IntDir> + </PropertyGroup> + <Import Project="pyproject.props" /> <PropertyGroup Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <IntDir>$(opensslDir)tmp\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir> - <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(opensslDir)tmp\$(ArchName)\$(ProjectName)\</IntDir> </PropertyGroup> <ItemGroup> diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index d8f39e4..f63c30d 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Py_IntDir"> <PropertyGroup Label="Globals"> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <OutDir>$(BuildPath)</OutDir> - <IntDir>$(SolutionDir)obj\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir> - <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(SolutionDir)obj\$(ArchName)\$(ProjectName)\</IntDir> + <OutDir Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)</OutDir> + <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir> + <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(SolutionDir)obj\</Py_IntDir> + <IntDir Condition="!HasTrailingSlash($(IntDir))">$(IntDir)\</IntDir> + <IntDir>$(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir> + <IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(Py_IntDir)\$(ArchName)_PGO\$(ProjectName)\</IntDir> <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName> <TargetName>$(TargetName)$(PyDebugExt)</TargetName> <GenerateManifest>false</GenerateManifest> diff --git a/PCbuild/python.props b/PCbuild/python.props index 22faf44..c87ad80 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -26,7 +26,8 @@ <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath> <!-- Directory where build outputs are put --> - <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath> + <BuildPath Condition="'$(PyBuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath> + <BuildPath Condition="'$(PyBuildPath)' != ''">$(PyBuildPath)</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <!-- Directories of external projects. tcltk is handled in tcltk.props --> |