Merge pull request #22595 from kreinholz/master

Add https support to FreeBSD builds (which also unbreaks builds where curl is installed and detected by find_package). Also, explicitly include <clocale> to unbreak with newer clang

Common/Render/Text/draw_text_sdl.cpp

@@ -12,6 +12,7 @@
 #include "Common/File/Path.h"
 #include "Common/Render/Text/draw_text.h"
 #include "Common/Render/Text/draw_text_sdl.h"
+#include <clocale>
 
 #if defined(USE_SDL3_TTF)
 

ext/naett-lib/src/naett_curl.c

@@ -1,6 +1,6 @@
 // PPSSPP addition - not part of upstream naett. See naett_curl.h.
 
-#if __linux__ && !__ANDROID__
+#if (__linux__ || defined(__FreeBSD__)) && !__ANDROID__
 
 #define NAETT_CURL_INTERNAL
 #include "naett_curl.h"

ext/naett-lib/src/naett_internal.h

@@ -27,6 +27,10 @@
 #include <curl/curl.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <curl/curl.h>
+#endif
+
 #if __ANDROID__
 #include <jni.h>
 #include <pthread.h>
@@ -102,7 +106,7 @@ typedef struct {
     pthread_t workerThread;
     int closeRequested;
 #endif
-#if __LINUX__
+#if __LINUX__ || defined(__FreeBSD__)
     struct curl_slist* headerList;
 #endif
 #if __WINDOWS__

ext/naett-lib/src/naett_linux.c

@@ -1,6 +1,6 @@
 #include "naett_internal.h"
 
-#if __linux__ && !__ANDROID__
+#if (__linux__ || defined(__FreeBSD__)) && !__ANDROID__
 
 // PPSSPP: libcurl is dlopen'd rather than linked, see naett_curl.h. This header stands in
 // for <curl/curl.h> and redirects the curl_* calls below through function pointers.