From 2db07f50fd2f12f61da1a71c3a37d4fac7feb669 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 14 Dec 2023 16:47:51 +0000 Subject: [PATCH] Fix the Windows build. [skip alpine ci] [skip irctest ci] [skip macos ci] [skip ubuntu ci] --- src/modules/extra/m_mysql.cpp | 2 +- win/conanfile.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index ee68ce2c0..f5337b938 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -62,7 +62,7 @@ #endif #ifdef _WIN32 -# pragma comment(lib, "mysqlclient.lib") +# pragma comment(lib, "libmysql.lib") #endif /* VERSION 3 API: With nonblocking (threaded) requests */ diff --git a/win/conanfile.txt b/win/conanfile.txt index b0548db44..d4f70d639 100644 --- a/win/conanfile.txt +++ b/win/conanfile.txt @@ -1,4 +1,4 @@ -# Last updated: 2022-09-10 +# Last updated: 2022-12-14 # # Modules we can't legally ship: geo_maxmind, ssl_mbedtls, ssl_openssl # Modules which don't apply to Windows: sslrehashsignal @@ -10,11 +10,11 @@ argon2/20190702 libmysqlclient/8.1.0 libpq/15.4 ## mbedtls/3.2.1 # unable to upgrade until mbedTLS issue #7087 is fixed -## openssl/3.1.4 +## openssl/3.2.0 pcre/8.45 pcre2/10.42 re2/20231101 -sqlite3/3.44.0 +sqlite3/3.44.2 [options] argon2:shared=True