fixed mac os build and disabled idn

This commit is contained in:
EinTim23 2024-11-02 12:26:37 +01:00
parent 0d5f0b67dd
commit 0d7d050777
6 changed files with 8 additions and 3 deletions

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "vendor/mbedtls"] [submodule "vendor/mbedtls"]
path = vendor/mbedtls path = vendor/mbedtls
url = https://github.com/Mbed-TLS/mbedtls.git url = https://github.com/Mbed-TLS/mbedtls.git
[submodule "vendor/wxWidgets"]
path = vendor/wxWidgets
url = https://github.com/wxWidgets/wxWidgets.git

View File

@ -1,5 +1,5 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include "../backend.hpp"
std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; } std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; }
#endif #endif

View File

@ -1,5 +1,5 @@
#if !defined(_WIN32) && !defined(__APPLE__) #if !defined(_WIN32) && !defined(__APPLE__)
#include "../backend.hpp"
std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; } std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; }
#endif #endif

View File

@ -43,7 +43,7 @@ namespace utils {
else if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') else if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
new_str += c; new_str += c;
else { else {
sprintf_s(bufHex, sizeof(bufHex), "%X", c); snprintf(bufHex, sizeof(bufHex), "%X", c);
if (ic < 16) if (ic < 16)
new_str += "%0"; new_str += "%0";
else else

View File

@ -4,6 +4,7 @@ SET(ENABLE_TESTING OFF FORCE)
add_subdirectory("mbedtls") add_subdirectory("mbedtls")
SET(CURL_USE_MBEDTLS ON) SET(CURL_USE_MBEDTLS ON)
SET(CURL_USE_LIBPSL OFF) SET(CURL_USE_LIBPSL OFF)
SET(USE_LIBIDN2 OFF)
SET(BUILD_STATIC_LIBS ON) SET(BUILD_STATIC_LIBS ON)
SET(BUILD_SHARED_LIBS OFF) SET(BUILD_SHARED_LIBS OFF)
SET(BUILD_CURL_EXE OFF) SET(BUILD_CURL_EXE OFF)

1
vendor/wxWidgets vendored Submodule

@ -0,0 +1 @@
Subproject commit 12b09a5e5ea76a1a0c27b769e821b37d803a4cb7