diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 23:13:19 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-07-16 23:13:19 (GMT) |
| commit | 6fd76bceda3fefc5e5814108c5fe819050613d33 (patch) | |
| tree | f8acf1d6f83647788e50ca1ad2b530b1a4f33560 /PCbuild/pyproject.props | |
| parent | ff1d5ab16e6424cf000be314e3c5ca8e42ae43f4 (diff) | |
| download | cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.zip cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.tar.gz cpython-6fd76bceda3fefc5e5814108c5fe819050613d33.tar.bz2 | |
Fixes use of Py_IntDir and Py_OutDir to control build directories.
Diffstat (limited to 'PCbuild/pyproject.props')
| -rw-r--r-- | PCbuild/pyproject.props | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index c56292a..a3a9c2b 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -4,10 +4,8 @@ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <OutDir>$(BuildPath)</OutDir> - <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> + <Py_IntDir Condition="'$(PyIntDir)' == ''">$(SolutionDir)obj\</Py_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> @@ -29,7 +27,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions> <Optimization>MaxSpeed</Optimization> @@ -85,9 +83,8 @@ <SuppressStartupBanner>true</SuppressStartupBanner> <TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment Condition="'$(Platform)' == 'x64'">X64</TargetEnvironment> - <TypeLibraryName>$(OutDir)wininst.tlb</TypeLibraryName> - <HeaderFileName> - </HeaderFileName> + <TypeLibraryName>$(OutDir)%(Filename).tlb</TypeLibraryName> + <HeaderFileName>$(IntDir)%(Filename)_h.h</HeaderFileName> </Midl> </ItemDefinitionGroup> |