diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-07 20:58:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 20:58:07 (GMT) |
| commit | 76006f285a7e146484d9296597d1d0ace778f992 (patch) | |
| tree | abc29395cebb68a14b401e627ca1492d97594614 /PCbuild | |
| parent | b03623227ed1264e3cac4e6bb4878d96b91aa484 (diff) | |
| download | cpython-76006f285a7e146484d9296597d1d0ace778f992.zip cpython-76006f285a7e146484d9296597d1d0ace778f992.tar.gz cpython-76006f285a7e146484d9296597d1d0ace778f992.tar.bz2 | |
[3.6] bpo-30389 Adds detection of VS 2017 to distutils._msvccompiler GH-1632 (#3425)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_lzma.vcxproj | 2 | ||||
| -rw-r--r-- | PCbuild/build.bat | 2 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj index 7ec2692..d8b159e 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -65,7 +65,7 @@ <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>$(OutDir)/liblzma$(PyDebugExt).lib</AdditionalDependencies> + <AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 2e6b0a9..5828b51 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -77,7 +77,7 @@ if "%~1"=="-e" (set IncludeExternals=true) & shift & goto CheckOpts if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts -if "%IncludeExternals%"=="" set IncludeExternals=false +if "%IncludeExternals%"=="" set IncludeExternals=true if "%IncludeSSL%"=="" set IncludeSSL=true if "%IncludeTkinter%"=="" set IncludeTkinter=true diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 6fd0440..0f01852 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -71,6 +71,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> @@ -214,6 +215,7 @@ <ClInclude Include="..\Python\wordcode_helpers.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" /> @@ -348,6 +350,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\random.c" /> <ClCompile Include="..\Python\_warnings.c" /> |