From 1ea411fb15930d734fb31c28dde01d919bd22f38 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 30 Nov 2012 01:13:15 +0200 Subject: We need to tell the MSVS 2010 build to use Windows7.1SDK At least for me it wouldn't build otherwise. But yeah, what it somebody uses MSVS 2010 with another SDK? It seems that the solution only offers the SDK 7.1 as an alternative? The default was v100, whatever that measn. Could it be that my MSVS 2010 installation is borked? Or that I did not have to install a bundled SDK with it, because I already had a separate 7.1 SDK? Also simplify a bit, no need to $(filter) on VCVER inside ifeqs that already check the very same VCVER. Change-Id: Ifef98c9466fc24db27d9e38c6878c77adfb4ed75 --- python3/ExternalProject_python3.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'python3') diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index b7ed7bdb9d77..b47f303da4a9 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -28,19 +28,19 @@ ifeq ($(VCVER),110) cd $(EXTERNAL_WORKDIR)/PCbuild \ && MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=v110 \ && cd $(EXTERNAL_WORKDIR) \ - && ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ + && ln -s PCbuild LO_lib \ && touch $@ else ifeq ($(VCVER),100) cd $(EXTERNAL_WORKDIR)/PCbuild \ - && MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \ + && MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=Windows7.1SDK /ToolsVersion:4.0 \ && cd $(EXTERNAL_WORKDIR) \ - && ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ + && ln -s PCbuild LO_lib \ && touch $@ else ifeq ($(VCVER),90) cd $(EXTERNAL_WORKDIR)/PC/VS9.0 \ && MAKEFLAGS= $(COMPATH)/vcpackages/vcbuild.exe pcbuild.sln "Release|$(if $(filter INTEL,$(CPUNAME)),Win32,x64)" \ && cd $(EXTERNAL_WORKDIR) \ - && ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ + && ln -s PC/VS9.0 LO_lib \ && touch $@ endif -- cgit