RepositoryExternal.mk | 2 +- python3/ExternalProject_python3.mk | 15 +++------------ solenv/gbuild/platform/com_MSC_defs.mk | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-)
New commits: commit 6b5455c2f9e9af292c13dc089ae406b4a6ed9fa5 Author: Michael Stahl <[email protected]> Date: Tue Jun 4 17:20:44 2013 +0200 python3: reduce MSVC copy/paste Change-Id: I225107d87e2fd084be536f524ae62fa0d60891f0 diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 0db0df8..805e739 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 commit 5b7ccf3406bc14c38346deca3d7d2d4adc1e048d Author: Michael Stahl <[email protected]> Date: Tue Jun 4 17:16:47 2013 +0200 RepositoryExternal: remove another MSVC 2008 conditional Change-Id: Ieb469dc19a479a70da4ec84390bbee91fd3e87f2 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5786836..4fcdf4b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2466,7 +2466,7 @@ $(call gb_LinkTarget__use_python_headers,$(1)) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/$(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild)$(if $(filter X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ + $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ commit 64921c7064cf1248f6af5a088300283f37e098e4 Author: Michael Stahl <[email protected]> Date: Tue Jun 4 17:11:36 2013 +0200 gbuild: get rid of that horrible $(shell...) ... just check against the only still supported MSVC instead (2010). Change-Id: I898bddb9156c04fa1daaf78fca9d5b4ec8f430cf diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 10cfc41..162fd2f 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -189,7 +189,7 @@ ifeq ($(VCVER),100) endif -ifeq ($(shell [ $(VCVER) -ge 110 ] && echo $(true)),$(true)) +ifneq ($(VCVER),100) # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A gb_RCFLAGS += -nologo endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
