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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |