diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-03-29 13:09:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:09:14 -0700 |
| commit | aaa6a031ced87d5b2c04023029bc5746dac52cb4 (patch) | |
| tree | 871b1ee880668dc1de107308ca69c9d3003d5712 /ports/python3/python_vcpkg.props.in | |
| parent | 76ab38bbd94001701d678643bf3a4d1cc43d7ca4 (diff) | |
| download | vcpkg-aaa6a031ced87d5b2c04023029bc5746dac52cb4.tar.gz vcpkg-aaa6a031ced87d5b2c04023029bc5746dac52cb4.zip | |
[python3] Add feature deprecated-win7-support. (#16420)
* [python3] Move /MACHINE into MSBuild file.
This prevents potential patch application conflicts.
* [python3] Add feature deprecated-win7-support.
This backports the fix for bpo-39401 from the Python 3.8 branch instead
of the one from the Python 3.9 branch, which dropped support for Windows
7.
* [python3] Bump port version.
* [python3] Fix goof in static patch that omitted pathcch.lib.
* x-add-version
* [python3] Revert trivial patch changes
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/python3/python_vcpkg.props.in')
| -rw-r--r-- | ports/python3/python_vcpkg.props.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in index c786e5fa0..e5b6093a5 100644 --- a/ports/python3/python_vcpkg.props.in +++ b/ports/python3/python_vcpkg.props.in @@ -31,5 +31,11 @@ ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
+
+ <Lib>
+ <!-- Required to prevent linker errors on Visual Studio 2017 with static CRT -->
+ <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x86'">MachineX86</TargetMachine>
+ <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x64'">MachineX64</TargetMachine>
+ </Lib>
</ItemDefinitionGroup>
</Project>
|