diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-27 08:19:30 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-03 21:51:30 +0000 |
| commit | 9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f (patch) | |
| tree | f3d66f0a7a24ca69186509a3313705ecd3061c53 /setup_native | |
| parent | fd27553f3848be20e113b99bdb756b7ce00c790f (diff) | |
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>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Library_instooofiltmsi.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_qslnkmsi.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_reg4allmsdoc.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_regactivex.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_sdqsmsi.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_sellangmsi.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_shlxtmsi.mk | 2 | ||||
| -rw-r--r-- | setup_native/Library_sn_tools.mk | 2 |
8 files changed, 16 insertions, 0 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 \ |