From ace1c08f783da88a6aa3361204624ca82852faa7 Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Mon, 22 Apr 2024 17:15:27 +0100 Subject: [PATCH] update legacy winlibs --- README.Rmd | 2 +- README.md | 2 +- src/Makevars.win | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.Rmd b/README.Rmd index d6bf43ec8..6e94caea1 100644 --- a/README.Rmd +++ b/README.Rmd @@ -161,7 +161,7 @@ As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm For R >= 4.2 using the 'Rtools42' or 'Rtools43' toolchains, 'libnng' v1.8.0 and 'libmbedtls' v3.6.0 LTS will be automatically compiled from the package sources during installation. -For previous R versions, pre-compiled 'libnng' v1.7.3 and 'libmbedtls' v3.6.0 LTS libraries are downloaded and used for installation instead. +For previous R versions, pre-compiled 'libnng' v1.8.0 and 'libmbedtls' v3.6.0 LTS libraries are downloaded and used for installation instead. ### Acknowledgements and Links diff --git a/README.md b/README.md index cfa88a272..0957ac506 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ For R \>= 4.2 using the ‘Rtools42’ or ‘Rtools43’ toolchains, ‘libnng v1.8.0 and ‘libmbedtls’ v3.6.0 LTS will be automatically compiled from the package sources during installation. -For previous R versions, pre-compiled ‘libnng’ v1.7.3 and ‘libmbedtls’ +For previous R versions, pre-compiled ‘libnng’ v1.8.0 and ‘libmbedtls’ v3.6.0 LTS libraries are downloaded and used for installation instead. ### Acknowledgements and Links diff --git a/src/Makevars.win b/src/Makevars.win index 1949ff0d8..aaa078795 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -4,12 +4,12 @@ else ARC="i386" endif -PKG_CFLAGS=-I../src-${ARC}/rwinlib-1.7.3_3.6.0/include -DNNG_STATIC_LIB $(C_VISIBILITY) -PKG_LIBS=-L../src-${ARC}/rwinlib-1.7.3_3.6.0/lib${R_ARCH} -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lbcrypt -lws2_32 +PKG_CFLAGS=-I../src-${ARC}/rwinlib-1.8.0_3.6.0/include -DNNG_STATIC_LIB $(C_VISIBILITY) +PKG_LIBS=-L../src-${ARC}/rwinlib-1.8.0_3.6.0/lib${R_ARCH} -lnng -lmbedtls -lmbedx509 -lmbedcrypto -lbcrypt -lws2_32 all: winlibs winlibs: - curl -sL /~https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.7.3_3.6.0.zip -o nng.zip + curl -sL /~https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.8.0_3.6.0.zip -o nng.zip unzip -q nng.zip rm -f nng.zip