diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-07 11:27:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 11:27:31 -0800 |
| commit | 31b1989394f801b7d569d0f00a2c00be7d6de96a (patch) | |
| tree | 7f28f0d33ebcef58db8983fc25293bc3381222af /ports/python3/0001-Static-library.patch | |
| parent | 023ffe900dc019443d0f0e618c4ddd5ea0390d5f (diff) | |
| parent | 23962328a4f0ea83de847d71a927ba1cc397b560 (diff) | |
| download | vcpkg-31b1989394f801b7d569d0f00a2c00be7d6de96a.tar.gz vcpkg-31b1989394f801b7d569d0f00a2c00be7d6de96a.zip | |
Merge pull request #2508 from albertziegenhagel/python3-3.6.4
[python3] Update to 3.6.4
Diffstat (limited to 'ports/python3/0001-Static-library.patch')
| -rw-r--r-- | ports/python3/0001-Static-library.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ports/python3/0001-Static-library.patch b/ports/python3/0001-Static-library.patch index 4bc10af41..b5666ba40 100644 --- a/ports/python3/0001-Static-library.patch +++ b/ports/python3/0001-Static-library.patch @@ -1,13 +1,5 @@ -diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 6ea1848..4134d7b 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj -@@ -1,4 +1,4 @@ --<?xml version="1.0" encoding="utf-8"?> -+<?xml version="1.0" encoding="utf-8"?> - <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> @@ -41,7 +41,7 @@ <Import Project="python.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> @@ -17,7 +9,7 @@ index 6ea1848..4134d7b 100644 <UseOfMfc>false</UseOfMfc> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -@@ -66,12 +66,24 @@ +@@ -67,13 +67,25 @@ <ClCompile> <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> <AdditionalIncludeDirectories>$(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -26,6 +18,7 @@ index 6ea1848..4134d7b 100644 </ClCompile> <Link> <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories> <BaseAddress>0x1e000000</BaseAddress> </Link> + <Lib> |
