diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-07-08 23:46:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-11 11:45:43 +0000 |
| commit | 5a03dad45290a92941aab61ef03247c04b78154f (patch) | |
| tree | 3e2c5f2524c1dea11be284d130ebb53492664119 | |
| parent | 705473c9bd787dff7b63f94a3a577b9510cb62af (diff) | |
VS2013: Adjust python3 to 12.0 vcproj version
Change-Id: Ic4566e8a199d3f31d6d4cb2d3fd41ad7b762c02a
Reviewed-on: https://gerrit.libreoffice.org/10162
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index f0b65ede92ca..3eda350fbd2b 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -35,10 +35,12 @@ $(call gb_ExternalProject_get_state_target,python3,build) : MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - $(if $(filter 100,$(VCVER)), \ - /ToolsVersion:4.0, \ - /p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \ + /p:VisualStudioVersion=10.0) \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \ + /p:VisualStudioVersion=12.0) \ ,PCBuild) else |