fixed mac os build and disabled idn
This commit is contained in:
parent
0d5f0b67dd
commit
0d7d050777
|
@ -10,3 +10,6 @@
|
|||
[submodule "vendor/mbedtls"]
|
||||
path = vendor/mbedtls
|
||||
url = https://github.com/Mbed-TLS/mbedtls.git
|
||||
[submodule "vendor/wxWidgets"]
|
||||
path = vendor/wxWidgets
|
||||
url = https://github.com/wxWidgets/wxWidgets.git
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#ifdef __APPLE__
|
||||
|
||||
#include "../backend.hpp"
|
||||
std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; }
|
||||
|
||||
#endif
|
|
@ -1,5 +1,5 @@
|
|||
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
|
||||
#include "../backend.hpp"
|
||||
std::shared_ptr<MediaInfo> backend::getMediaInformation() { return nullptr; }
|
||||
|
||||
#endif
|
|
@ -43,7 +43,7 @@ namespace utils {
|
|||
else if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
|
||||
new_str += c;
|
||||
else {
|
||||
sprintf_s(bufHex, sizeof(bufHex), "%X", c);
|
||||
snprintf(bufHex, sizeof(bufHex), "%X", c);
|
||||
if (ic < 16)
|
||||
new_str += "%0";
|
||||
else
|
||||
|
|
|
@ -4,6 +4,7 @@ SET(ENABLE_TESTING OFF FORCE)
|
|||
add_subdirectory("mbedtls")
|
||||
SET(CURL_USE_MBEDTLS ON)
|
||||
SET(CURL_USE_LIBPSL OFF)
|
||||
SET(USE_LIBIDN2 OFF)
|
||||
SET(BUILD_STATIC_LIBS ON)
|
||||
SET(BUILD_SHARED_LIBS OFF)
|
||||
SET(BUILD_CURL_EXE OFF)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 12b09a5e5ea76a1a0c27b769e821b37d803a4cb7
|
Loading…
Reference in New Issue