configure.ac | 6 +----- solenv/gbuild/platform/com_MSC_defs.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit 5225cd46919a028add3772564fd0d63e99078820 Author: Christian Lohmaier <[email protected]> Date: Wed Dec 10 15:21:30 2014 +0100 define _USING_V110_SDK71_ when building with VS2013 against 7.1A SDK and drop old VS2012 part from configure.ac Change-Id: If0bedff0972a40f92aaf86140a0405d2af1dbc8d diff --git a/configure.ac b/configure.ac index 0fcfbc1..4db47f3 100644 --- a/configure.ac +++ b/configure.ac @@ -3522,13 +3522,9 @@ if test "$_os" = "WINNT"; then # are always "better", we list them in reverse chronological order. case $vcnum in - 110) - COMEX=14 - WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.0 7.1A" - ;; 120) COMEX=15 - WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0" + WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0 7.1A" ;; esac diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 2c6dc19..7590a7b 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -47,7 +47,7 @@ gb_COMPILERDEFS := \ -D_MT \ -D_DLL \ -DCPPU_ENV=$(gb_CPPU_ENV) \ - $(if $(findstring 110_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ + $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ ifeq ($(CPUNAME),INTEL) gb_COMPILERDEFS += \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
