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/Library_instooofiltmsi.mk | |
| parent | climaker: Fix std::array and cli::array collision (diff) | |
| download | core-9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f.tar.gz core-9a8a4442fd6368c20cf6a3d7efa3bd42962ee12f.zip | |
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/Library_instooofiltmsi.mk')
| -rw-r--r-- | setup_native/Library_instooofiltmsi.mk | 2 |
1 files changed, 2 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 \ )) |