From 476e2fa6a6446f1efbabbfa9b7f62e505550a69c Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Thu, 25 Jan 2024 15:28:51 +0100 Subject: [PATCH] Use openssl from rtools if available --- src/Makevars.win | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Makevars.win b/src/Makevars.win index f4c8cfd7..31ed40b7 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,6 +1,14 @@ +OPENSSL_LIBS = $(shell pkg-config --libs openssl) + +# Config for legacy rtools without pkgconfig +ifeq (,$(OPENSSL_LIBS)) +OPENSSL_LIBS=-L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32 +OPENSSL_CFLAGS=-I../windows/openssl-$(VERSION)/include +endif + VERSION = 1.1.1k -PKG_CPPFLAGS = -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../windows/openssl-$(VERSION)/include -I../src -PKG_LIBS = -Ls2 -ls2static -L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32 +PKG_CPPFLAGS = -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME $(OPENSSL_CFLAGS) -I../src +PKG_LIBS = -Ls2 -ls2static $(OPENSSL_LIBS) CXX_STD = CXX11