diff --git a/3rdparty/curl/curl b/3rdparty/curl/curl index 50490c0679..6fa1d817e5 160000 --- a/3rdparty/curl/curl +++ b/3rdparty/curl/curl @@ -1 +1 @@ -Subproject commit 50490c0679fcd0e50bb3a8fbf2d9244845652cf0 +Subproject commit 6fa1d817e5b1a00d7d0c8168091877476b499317 diff --git a/3rdparty/curl/libcurl.vcxproj b/3rdparty/curl/libcurl.vcxproj index 250aafae3e..5056136351 100644 --- a/3rdparty/curl/libcurl.vcxproj +++ b/3rdparty/curl/libcurl.vcxproj @@ -84,7 +84,6 @@ - @@ -95,6 +94,7 @@ + @@ -211,12 +211,10 @@ - - @@ -273,7 +271,6 @@ - @@ -291,6 +288,7 @@ + @@ -390,12 +388,10 @@ - - diff --git a/3rdparty/curl/libcurl.vcxproj.filters b/3rdparty/curl/libcurl.vcxproj.filters index 32123f804a..845396d5a2 100644 --- a/3rdparty/curl/libcurl.vcxproj.filters +++ b/3rdparty/curl/libcurl.vcxproj.filters @@ -378,9 +378,6 @@ Source Files - - Source Files - Source Files @@ -390,9 +387,6 @@ Source Files - - Source Files - Source Files @@ -474,9 +468,6 @@ Source Files - - Source Files - Source Files @@ -510,6 +501,9 @@ Source Files + + Source Files + @@ -902,9 +896,6 @@ Header Files - - Header Files - Header Files @@ -914,9 +905,6 @@ Header Files - - Header Files - Header Files @@ -1001,9 +989,6 @@ Header Files - - Header Files - Header Files @@ -1040,6 +1025,9 @@ Header Files + + Header Files + diff --git a/3rdparty/wolfssl/extra/win32/user_settings.h b/3rdparty/wolfssl/extra/win32/user_settings.h index 800f963ee0..016a7f20c6 100644 --- a/3rdparty/wolfssl/extra/win32/user_settings.h +++ b/3rdparty/wolfssl/extra/win32/user_settings.h @@ -7,6 +7,7 @@ #endif /* Configurations */ +#define WOLFSSL_SYS_CA_CERTS #define WOLFSSL_DES_ECB #define HAVE_FFDHE_2048 #define TFM_TIMING_RESISTANT