diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-05-02 16:24:00 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-05-03 06:54:08 +0200 |
| commit | 1661a3ee77d78807f287146f8190d02d89963fe2 (patch) | |
| tree | efc95ab20c3ca15f63d8e50d4ed093a2c40acbf0 /external/libwebp/ExternalProject_libwebp.mk | |
| parent | 69f412459257398a7d779541dad95aa7227a5e74 (diff) | |
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.lunak@collabora.com>
Diffstat (limited to 'external/libwebp/ExternalProject_libwebp.mk')
| -rw-r--r-- | external/libwebp/ExternalProject_libwebp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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))) \ |