From 21ada251fe2fa477ddaefaeb3108fde7c0bbad42 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 15 Jun 2023 20:45:00 +0200 Subject: [PATCH] Update dependencies --- 3rdparty/FAudio | 2 +- 3rdparty/curl/curl | 2 +- 3rdparty/libpng/libpng | 2 +- 3rdparty/libsdl-org/SDL | 2 +- 3rdparty/wolfssl/extra/win32/user_settings.h | 6 ++++++ 3rdparty/wolfssl/wolfssl | 2 +- 3rdparty/wolfssl/wolfssl.vcxproj | 1 + 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/3rdparty/FAudio b/3rdparty/FAudio index cac0aca5f7..58cf606b5f 160000 --- a/3rdparty/FAudio +++ b/3rdparty/FAudio @@ -1 +1 @@ -Subproject commit cac0aca5f7055bd0d57c1051278684c737b9af0c +Subproject commit 58cf606b5f718883e5dffbafdec44859d4e304ec diff --git a/3rdparty/curl/curl b/3rdparty/curl/curl index 1561d06752..7ab9d43720 160000 --- a/3rdparty/curl/curl +++ b/3rdparty/curl/curl @@ -1 +1 @@ -Subproject commit 1561d0675208854b39066877b140780a965702fa +Subproject commit 7ab9d43720bc34d9aa351c7ca683c1668ebf8335 diff --git a/3rdparty/libpng/libpng b/3rdparty/libpng/libpng index 07b8803110..f135775ad4 160000 --- a/3rdparty/libpng/libpng +++ b/3rdparty/libpng/libpng @@ -1 +1 @@ -Subproject commit 07b8803110da160b158ebfef872627da6c85cbdf +Subproject commit f135775ad4e5d4408d2e12ffcc71bb36e6b48551 diff --git a/3rdparty/libsdl-org/SDL b/3rdparty/libsdl-org/SDL index ac13ca9ab6..ffa78e6bea 160000 --- a/3rdparty/libsdl-org/SDL +++ b/3rdparty/libsdl-org/SDL @@ -1 +1 @@ -Subproject commit ac13ca9ab691e13e8eebe9684740ddcb0d716203 +Subproject commit ffa78e6bead23e2ba3adf8ec2367ff2218d4343c diff --git a/3rdparty/wolfssl/extra/win32/user_settings.h b/3rdparty/wolfssl/extra/win32/user_settings.h index 64dc836eb0..800f963ee0 100644 --- a/3rdparty/wolfssl/extra/win32/user_settings.h +++ b/3rdparty/wolfssl/extra/win32/user_settings.h @@ -37,6 +37,7 @@ #define NO_PSK #define HAVE_EXTENDED_MASTER #define WOLFSSL_SNIFFER +#define WOLFSSL_IGNORE_FILE_WARN #define HAVE_AESGCM #define HAVE_SUPPORTED_CURVES #define HAVE_TLS_EXTENSIONS @@ -63,11 +64,16 @@ extern FILE* wolfSSL_fopen_utf8(const char* name, const char* mode); #define XFWRITE fwrite #define XFCLOSE fclose #define XSEEK_END SEEK_END +#define XSEEK_SET SEEK_SET #define XBADFILE NULL #define XFGETS fgets #define XFPRINTF fprintf #define XFFLUSH fflush +/* For some reason we need to define ssize_t */ +#define HAVE_SSIZE_T +#define ssize_t __int64 + #include extern int wolfSSL_stat_utf8(const char* path, struct _stat* buffer); #define XSTAT wolfSSL_stat_utf8 diff --git a/3rdparty/wolfssl/wolfssl b/3rdparty/wolfssl/wolfssl index 979707380c..3b3c175af0 160000 --- a/3rdparty/wolfssl/wolfssl +++ b/3rdparty/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 979707380c677dfa65e3ba48f19e149773a4a32d +Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f diff --git a/3rdparty/wolfssl/wolfssl.vcxproj b/3rdparty/wolfssl/wolfssl.vcxproj index ce796eca88..2538183e51 100644 --- a/3rdparty/wolfssl/wolfssl.vcxproj +++ b/3rdparty/wolfssl/wolfssl.vcxproj @@ -73,6 +73,7 @@ +