summaryrefslogtreecommitdiffstats
path: root/PCbuild/pythoncore.vcxproj
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2017-09-07 18:49:23 (GMT)
committerGitHub <noreply@github.com>2017-09-07 18:49:23 (GMT)
commit05f01d85257d0f3409c7335aaf0bf6a6da7eecb7 (patch)
tree32f5e8671e6f384e1ee8b3d38c45495778f45f03 /PCbuild/pythoncore.vcxproj
parenta853a8ba7850381d49b284295dd6f0dc491dbe44 (diff)
downloadcpython-05f01d85257d0f3409c7335aaf0bf6a6da7eecb7.zip
cpython-05f01d85257d0f3409c7335aaf0bf6a6da7eecb7.tar.gz
cpython-05f01d85257d0f3409c7335aaf0bf6a6da7eecb7.tar.bz2
bpo-30389 Adds detection of VS 2017 to distutils._msvccompiler (#1632)
Diffstat (limited to 'PCbuild/pythoncore.vcxproj')
-rw-r--r--PCbuild/pythoncore.vcxproj5
1 files changed, 5 insertions, 0 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index b0d2e9b..5991095 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -50,6 +50,8 @@
<PropertyGroup>
<KillPython>true</KillPython>
<RequirePGCFiles>true</RequirePGCFiles>
+ <IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(zlibDir)\zlib.h')">true</IncludeExternals>
+ <IncludeExternals Condition="$(IncludeExternals) == ''">false</IncludeExternals>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -73,6 +75,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -218,6 +221,7 @@
<ClInclude Include="$(zlibDir)\zutil.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\Modules\_asynciomodule.c" />
<ClCompile Include="..\Modules\_bisectmodule.c" />
<ClCompile Include="..\Modules\_blake2\blake2module.c" />
<ClCompile Include="..\Modules\_blake2\blake2b_impl.c" />
@@ -341,6 +345,7 @@
<ClCompile Include="..\PC\config.c" />
<ClCompile Include="..\PC\getpathp.c" />
<ClCompile Include="..\PC\msvcrtmodule.c" />
+ <ClCompile Include="..\PC\_findvs.cpp" />
<ClCompile Include="..\Python\pyhash.c" />
<ClCompile Include="..\Python\_warnings.c" />
<ClCompile Include="..\Python\asdl.c" />