setup_native: Add vcruntime and libucrt on MSVC 14.0

Change-Id: If55979b55b4bc8dee785f0940461a01995060682
Reviewed-on: https://gerrit.libreoffice.org/17362
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

9 files changed, 18 insertions, 2 deletions

diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index a4c9fa8cc8cf..770f80f7453c 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,instooofiltmsi,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	kernel32 \
 ))
 
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 2e5e2fe6f6f5..8aa88685884b 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,qslnkmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,qslnkmsi,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	msi \
 	kernel32 \
 	user32 \
diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk
index 671317639110..64aa20f42691 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\
 $(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	msi \
 	kernel32 \
 	user32 \
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index c823d7ce2cc2..3d0a51e0338a 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,regactivex,\
 $(eval $(call gb_Library_use_system_win32_libs,regactivex,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	kernel32 \
 	msi \
 ))
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index 732159e7094d..2f29e16ecbcc 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sdqsmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,sdqsmsi,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	msi \
 	kernel32 \
 	user32 \
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 2df29fc8bcfe..60d4e95a65ff 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_add_exception_objects,sellangmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,sellangmsi,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	msi \
 	kernel32 \
 	user32 \
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index ae619e6dd47c..161ff8ad01bc 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Library_use_static_libraries,shlxtmsi,\
 $(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	msi \
 	kernel32 \
 	advapi32 \
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index c857d0daf710..68aeeedcab99 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sn_tools,\
 $(eval $(call gb_Library_use_system_win32_libs,sn_tools,\
 	libcmt \
 	libcpmt \
+	$(if $(filter-out 120,$(VCVER)),libucrt) \
+	$(if $(filter-out 120,$(VCVER)),libvcruntime) \
 	kernel32 \
 	msi \
 	advapi32 \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 6b39a4de8d03..6fdab45b5587 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 define gb_MSVCRT_subst
-$(if $(MSVC_USE_DEBUG_RUNTIME),$(subst msvcrt,msvcrtd,$(subst msvcprt,msvcprtd,$(subst libcmt,libcmtd,$(subst libcpmt,libcpmtd,$(subst msvcmrt,msvcmrtd,$(1)))))),$(1))
+$(if $(MSVC_USE_DEBUG_RUNTIME),$(subst msvcrt,msvcrtd,$(subst msvcprt,msvcprtd,$(subst libcmt,libcmtd,$(subst libvcruntime,libvcruntimed,$(subst libucrt,libucrtd,$(subst libcpmt,libcpmtd,$(subst msvcmrt,msvcmrtd,$(1)))))))),$(1))
 endef
 
 define gb_LinkTarget_use_system_win32_libs
@@ -204,7 +204,7 @@ $(if $(call gb_LinkTarget__is_merged,$(1)),\
 	$(call gb_LinkTarget_add_libs,$(call gb_Library_get_linktarget,merged),$(foreach lib,$(2),$(call gb_MSVCRT_subst,$(lib)).lib)))
 endef
 
-# Flags common for PE executables (EXEs and DLLs) 
+# Flags common for PE executables (EXEs and DLLs)
 gb_Windows_PE_TARGETTYPEFLAGS := \
 	-release \
 	-opt:noref \