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>2019-08-30 23:31:47 +0200
commit4f17add2a15a3b5f349e2deba156dd99c7485fc8 (patch)
tree0aabfb25d1298972f686e5acafb545724b320ae0
parent5f085b299706028c12d58c645375420df67b0ae2 (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 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