Skip to content

Commit cc0e476

Browse files
committed
Windows: update to libxml2 2.10.3
1 parent b2c9bc6 commit cc0e476

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+6
-14484
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# xml2 (development version)
22

3+
* Windows: update to libxml2 2.10.3
4+
35
# xml2 1.3.3
46

57
* Hadley Wickham is now (again) the maintainer.

src/Makevars.ucrt

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Makevars.win

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
VERSION=2.9.10
1+
VERSION=2.10.3
22
RWINLIB=../windows/libxml2-$(VERSION)
33
PKG_CPPFLAGS=-I../inst/include -I$(RWINLIB)/include/libxml2 \
44
-DLIBXML_STATIC
55

6-
PKG_LIBS=-L$(RWINLIB)/lib${R_ARCH}${CRT} -lxml2 -llzma -liconv -lz -lws2_32
6+
PKG_LIBS = -L$(RWINLIB)/lib${subst gcc,,$(COMPILED_BY)}$(R_ARCH) \
7+
-L$(RWINLIB)/lib$(R_ARCH)\
8+
-lxml2 -llzma -liconv -lz -lws2_32
79

810
all: clean winlibs
911

windows/libxml2-2.9.4/include/libxml2/libxml/DOCBparser.h

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)