summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-01-18 12:18:01 +0100
committerAndras Timar <andras.timar@collabora.com>2021-05-10 16:17:50 +0200
commit8e8c4f4ce77da9983d5248b4edd0d9608bfa5b18 (patch)
treeb6e26d590fa0d8d024c74cebaf93b4c12a6da68a
parent50f7c2fc6ef242300c9372e08129284d6d547d63 (diff)
libxml2: fix MSVC build
libxml2.rc(1) : fatal error RC1015: cannot open include file 'winver.h'. Change-Id: I6653eaefd1da0440811154a718683951d79fb871
-rw-r--r--external/libxml2/ExternalProject_xml2.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index f60d960d6790..54815e55d812 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -22,7 +22,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& unset MAKEFLAGS \
- && LIB="$(ILIB)" nmake \
+ && INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \
+ LIB="$(ILIB)" nmake \
,win32)
else # OS!=WNT
$(call gb_ExternalProject_get_state_target,xml2,build):