From d17ad135a392de27638db7be3718d6030e59e86e Mon Sep 17 00:00:00 2001 From: Jay Hesselberth Date: Mon, 23 Dec 2024 17:48:52 -0700 Subject: [PATCH] Try on windows --- .github/workflows/R-CMD-check.yaml | 2 +- src/Makevars.win | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 src/Makevars.win diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 804b4c7..562fe0f 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -20,7 +20,7 @@ jobs: matrix: config: - {os: macos-latest, r: 'release'} - # - {os: windows-latest, r: 'release'} + - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'oldrel-1'} diff --git a/src/Makevars.win b/src/Makevars.win deleted file mode 100644 index 67084c6..0000000 --- a/src/Makevars.win +++ /dev/null @@ -1,20 +0,0 @@ -RWINLIB = ../windows/libcurl -TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH) - -PKG_LIBS = \ - -L$(RWINLIB)/$(TARGET) \ - -L$(RWINLIB)/lib \ - -lwinhttp -lcurl -lnghttp2 -lssh2 -lz -lssl -lcrypto -pthread -lgdi32 -lws2_32 -lcrypt32 -lbcrypt -lwldap32 - -PKG_CPPFLAGS= \ - -I$(RWINLIB)/include -DCURL_STATICLIB -DSTRICT_R_HEADERS -DR_NO_REMAP - -all: clean winlibs - -clean: - rm -f $(SHLIB) $(OBJECTS) - -winlibs: clean - "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" - -.PHONY: all winlibs cleanl \ No newline at end of file