diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-04 17:20:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-04 17:21:15 +0200 |
| commit | 6b5455c2f9e9af292c13dc089ae406b4a6ed9fa5 (patch) | |
| tree | 606d32fe2d099a37ed43dc43401b8dcbc106e42b /python3 | |
| parent | 5b7ccf3406bc14c38346deca3d7d2d4adc1e048d (diff) | |
python3: reduce MSVC copy/paste
Change-Id: I225107d87e2fd084be536f524ae62fa0d60891f0
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/ExternalProject_python3.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 0db0df895856..805e73929062 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -31,25 +31,16 @@ ifeq ($(OS)$(COM),WNTMSC) # at least for MSVC 2008 it is necessary to clear MAKEFLAGS because # nmake is invoked $(call gb_ExternalProject_get_state_target,python3,build) : -ifeq ($(VCVER),110) - $(call gb_ExternalProject_run,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) \ - /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 \ - && cd $(EXTERNAL_WORKDIR) \ - && ln -s PCbuild LO_lib \ - ,PCBuild) -else ifeq ($(VCVER),100) $(call gb_ExternalProject_run,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) \ - /ToolsVersion:4.0 \ + $(if $(filter 100,$(VCVER)), \ + /ToolsVersion:4.0, \ + /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ && cd $(EXTERNAL_WORKDIR) \ && ln -s PCbuild LO_lib \ ,PCBuild) -endif else |