summaryrefslogtreecommitdiffstats
path: root/external/python3
diff options
context:
space:
mode:
authorTomoyuki Kubota <himajin100000@gmail.com>2019-02-22 15:35:39 +0900
committerMichael Stahl <Michael.Stahl@cib.de>2019-04-16 13:01:03 +0200
commitf61d6474205793b0838d90b09037cef52408a4b9 (patch)
treec2cfcb7cbd32eb7930bf259c3f0f3107a5718360 /external/python3
parentfix usage of successful/successfully in comments (diff)
downloadcore-f61d6474205793b0838d90b09037cef52408a4b9.tar.gz
core-f61d6474205793b0838d90b09037cef52408a4b9.zip
Initial VS 2019 Support
Change-Id: I8e08efb549ebd52c37183a1185d6de73f2b00601 Reviewed-on: https://gerrit.libreoffice.org/64630 Reviewed-by: himajin100000 <himajin100000@gmail.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'external/python3')
-rw-r--r--external/python3/ExternalProject_python3.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index cd5d2c23d7b6..dafeb1ca5ae8 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -38,7 +38,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
/maxcpucount \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
- $(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
+ $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
,PCBuild)
else