diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-22 17:46:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 17:46:39 -0700 |
| commit | 082c827fd38eabf3a8f60407cbc19df715432143 (patch) | |
| tree | 7b07727b0c6a1acc10b0bb16dc74e2f64e146c90 /ports/python3/0001-Static-library.patch | |
| parent | 621d2f852d43b5766bbf13bd22591524a083e48e (diff) | |
| parent | 683d8a8820680fc017d0faef08bac490f68e781e (diff) | |
| download | vcpkg-082c827fd38eabf3a8f60407cbc19df715432143.tar.gz vcpkg-082c827fd38eabf3a8f60407cbc19df715432143.zip | |
Merge pull request #1123 from muemart/python
Add port for Python 3
Diffstat (limited to 'ports/python3/0001-Static-library.patch')
| -rw-r--r-- | ports/python3/0001-Static-library.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/ports/python3/0001-Static-library.patch b/ports/python3/0001-Static-library.patch new file mode 100644 index 000000000..4bc10af41 --- /dev/null +++ b/ports/python3/0001-Static-library.patch @@ -0,0 +1,46 @@ +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" /> + <PropertyGroup Label="Configuration"> +- <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> +@@ -66,12 +66,24 @@ + <ClCompile> + <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>$(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_NO_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <BaseAddress>0x1e000000</BaseAddress> + </Link> ++ <Lib> ++ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine> ++ </Lib> ++ <Lib> ++ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MachineX86</TargetMachine> ++ </Lib> ++ <Lib> ++ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MachineX86</TargetMachine> ++ </Lib> ++ <Lib> ++ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MachineX86</TargetMachine> ++ </Lib> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\Include\abstract.h" /> +-- |