[Libreoffice-commits] core.git: external/python3

David Ostrovsky david at ostrovsky.org
Tue Oct 27 00:34:41 PDT 2015


 external/python3/ExternalProject_python3.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cd15605876bb0bfa8921a8c1779feed49189d165
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Jul 27 08:13:21 2015 +0200

    Fix python3 on MSVC 14.0
    
    Change-Id: I2882a97d0e078bd3217170e7906cd41680fbc4a4
    Reviewed-on: https://gerrit.libreoffice.org/17360
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
old mode 100644
new mode 100755
index 72afab7..200588f
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -37,6 +37,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
 			$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \
 				/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
+			$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 \
+				/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
 	,PCBuild)
 
 else


More information about the Libreoffice-commits mailing list