summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-01-18 12:18:01 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-11-23 10:23:40 +0100
commit50564f24d987c9ae7ce6a8c3e96a20d36cb77e94 (patch)
tree860d5be847e2f238b8fa853d2af941b36d88b44e
parenta0de89d12bb6d4035c9a3b6b1511c7ab48e8cf15 (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 5d8eba48de44..c48855eca238 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -33,7 +33,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
cscript configure.js \
iconv=no sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
&& unset MAKEFLAGS \
- && LIB="$(ILIB)" nmake \
+ && INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \
+ LIB="$(ILIB)" nmake \
,win32)
endif
else # OS!=WNT