diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
| commit | c30363d07b3f64b5f38531442ea92d9c1cf81d13 (patch) | |
| tree | 8a169a2a0aadf40dad50e73d226c3eca1e949327 /ports/python3/0001-Static-library.patch | |
| parent | 47189e90d59459be69d4f6a0b039849913031c8e (diff) | |
| parent | 28c5c6ae4601c323cbd57a13da03b9047dc282ad (diff) | |
| download | vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.tar.gz vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.zip | |
Merge branch 'master' into qt5_modular
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> |