diff --git a/NEWS.md b/NEWS.md index bc69a92..697f6c9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,8 @@ * `XPtr` gets explicit copy constructor and assignment operator definitions, which were two missing components of the [Rule of three](https://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming)) (@michaelchirico) +* Windows: update to libxml2 2.9.10 and libxslt 1.1.34 and add ucrt libs + # xml2 1.3.2 * `read_html()` and `read_xml()` now error if passed strings of length greater than one (#121) diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt new file mode 100644 index 0000000..1a2e101 --- /dev/null +++ b/src/Makevars.ucrt @@ -0,0 +1,2 @@ +CRT=-ucrt +include Makevars.win diff --git a/src/Makevars.win b/src/Makevars.win index b278b9a..e0f6d1d 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,9 +1,9 @@ -VERSION=2.9.8 +VERSION=2.9.10 RWINLIB=../windows/libxml2-$(VERSION) PKG_CPPFLAGS=-I../inst/include -I$(RWINLIB)/include/libxml2 \ -DLIBXML_STATIC -PKG_LIBS=-L$(RWINLIB)/lib${R_ARCH} -lxml2 -llzma -liconv -lz -lws2_32 +PKG_LIBS=-L$(RWINLIB)/lib${R_ARCH}${CRT} -lxml2 -llzma -liconv -lz -lws2_32 all: clean winlibs