RepositoryExternal.mk | 2 +-
external/libwebp/ExternalProject_libwebp.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1661a3ee77d78807f287146f8190d02d89963fe2
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon May 2 16:24:00 2022 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue May 3 06:54:08 2022 +0200
use proper MSVC runtime lib for libwebp
Change-Id: Icf976bb4a4593bfa8e8fc506d4c5e86cb7f88671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133705
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b51660e182cb..590a6093aea1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2638,7 +2638,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(gb_StaticLibrary_PLAINEXT)
\
+ $(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if
$(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/libwebp/ExternalProject_libwebp.mk
b/external/libwebp/ExternalProject_libwebp.mk
index 3f38572ccefc..0146bd72acfc 100644
--- a/external/libwebp/ExternalProject_libwebp.mk
+++ b/external/libwebp/ExternalProject_libwebp.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libwebp,build))
$(call gb_ExternalProject_get_state_target,libwebp,build):
$(call gb_Trace_StartRange,libwebp,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- nmake -nologo -f Makefile.vc CFG=release-static RTLIBCFG=static
OBJDIR=output \
+ nmake -nologo -f Makefile.vc CFG=$(if
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-static RTLIBCFG=dynamic OBJDIR=output \
$(if $(filter INTEL,$(CPUNAME)),ARCH=x86, \
$(if $(filter X86_64,$(CPUNAME)),ARCH=x64, \
$(if $(filter AARCH64,$(CPUNAME)),ARCH=ARM))) \
