Browse code

link to the latest version of libxml2 build with UCRT tool chain

mikejiang authored on 15/03/2022 01:21:15
Showing 1 changed files

... ...
@@ -2,13 +2,13 @@
2 2
 CXX_STD = CXX11
3 3
 #libxml is an odd ball with extra nested path(libxml2/libxml/xxx) that doesn't conform to the include path as the rest 
4 4
 #so can't use the default libs shipped with Rtools4
5
-VERSION=2.9.8
5
+VERSION=2.9.10
6 6
 RWINLIB=../windows/libxml2-$(VERSION)
7 7
 PKG_CPPFLAGS =-DROUT -I../inst/include/ -I$(RWINLIB)/include/libxml2 -DLIBXML_STATIC -fpermissive
8 8
 
9 9
 #needs to wrap in $(shell) to strip the quotes returned by rhdf5lib::pkgconfig
10 10
 RHDF5_LIBS= $(shell "${R_HOME}/bin/Rscript" -e "Rhdf5lib::pkgconfig('PKG_CXX_LIBS')")
11
-libxmllibs=-L$(RWINLIB)/lib${R_ARCH} -lxml2 -llzma -liconv -lz
11
+libxmllibs=-L$(RWINLIB)/lib${R_ARCH}-ucrt -lxml2 -llzma -liconv -lz
12 12
 
13 13
 PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(libxmllibs) `${R_HOME}/bin/Rscript -e "cytolib:::cytolib_LdFlags();cat(' ');RProtoBufLib:::LdFlags()"` ${RHDF5_LIBS} -lws2_32  -lbcrypt
14 14