[Libreoffice-commits] core.git: setup_native/Library_instooofiltmsi.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_sellangmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk solenv/gbuild

[David Ostrovsky]

 setup_native/Library_instooofiltmsi.mk  |    2 ++
 setup_native/Library_qslnkmsi.mk        |    2 ++
 setup_native/Library_reg4allmsdoc.mk    |    2 ++
 setup_native/Library_regactivex.mk      |    2 ++
 setup_native/Library_sdqsmsi.mk         |    2 ++
 setup_native/Library_sellangmsi.mk      |    2 ++
 setup_native/Library_shlxtmsi.mk        |    2 ++
 setup_native/Library_sn_tools.mk        |    2 ++
 solenv/gbuild/platform/com_MSC_class.mk |    4 ++--
 9 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Jul 27 08:19:30 2015 +0200

    setup_native: Add vcruntime and libucrt on MSVC 14.0
    
    Change-Id: If55979b55b4bc8dee785f0940461a01995060682
    Reviewed-on: https://gerrit.libreoffice.org/17362
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index a4c9fa8..770f80f 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 2e5e2fe..8aa8868 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 6713176..64aa20f 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 c823d7c..3d0a51e 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 732159e..2f29e16 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 2df29fc..60d4e95 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 ae619e6..161ff8a 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 c857d0d..68aeeed 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 6b39a4d..6fdab45 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 \