Skip to content

Commit 9a6dfea

Browse files
committed
Update libmariadb on Windows
1 parent bd469b1 commit 9a6dfea

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/Makevars.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PKG_CPPFLAGS= -I../windows/libmariadbclient-2.3.4/include/mariadb
2-
PKG_LIBS= -L../windows/libmariadbclient-2.3.4/lib${R_ARCH} \
1+
PKG_CPPFLAGS= -I../windows/libmariadbclient-2.3.5/include/mariadb
2+
PKG_LIBS= -L../windows/libmariadbclient-2.3.5/lib${R_ARCH} \
33
-lmariadbclient -lssl -lcrypto -lgdi32 -lz -lws2_32 -pthread
44

55
all: clean winlibs

tools/winlibs.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Link against mariadb native client static libraries
22
# Info and source code: https://downloads.mariadb.org/client-native/
3-
if(!file.exists("../windows/libmariadbclient-2.3.4/include/mariadb/mysql.h")){
3+
if(!file.exists("../windows/libmariadbclient-2.3.5/include/mariadb/mysql.h")){
44
if(getRversion() < "3.3.0") setInternet2()
5-
curl::curl_download("https://github.com/rwinlib/libmariadbclient/archive/v2.3.4.zip", "lib.zip")
5+
curl::curl_download("https://github.com/rwinlib/libmariadbclient/archive/v2.3.5.zip", "lib.zip")
66
dir.create("../windows", showWarnings = FALSE)
77
unzip("lib.zip", exdir = "../windows")
88
unlink("lib.zip")

0 commit comments

Comments
 (0)