external/libxml2/ExternalProject_xml2.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ffe4087fcf2c48437ef10e73b0f4ddcfcd517f0d
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Jan 18 12:18:01 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Jan 18 12:18:01 2019 +0100
libxml2: fix MSVC build
libxml2.rc(1) : fatal error RC1015: cannot open include file 'winver.h'.
Change-Id: I6653eaefd1da0440811154a718683951d79fb871
diff --git a/external/libxml2/ExternalProject_xml2.mk
b/external/libxml2/ExternalProject_xml2.mk
index dc3ab2f8b2e4..88aa8deeb9b3 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
cscript /e:javascript configure.js \
iconv=no icu=yes sax1=yes $(if
$(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
&& unset MAKEFLAGS \
- && LIB="$(ILIB)" nmake \
+ && INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \
+ LIB="$(ILIB)" nmake \
,win32)
endif
else # OS!=WNT
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
