diff --git a/.gitmodules b/.gitmodules index 2a85b6c..c8c6969 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/src/backends/darwin.cpp b/src/backends/darwin.cpp index fa4904e..99a8a1a 100644 --- a/src/backends/darwin.cpp +++ b/src/backends/darwin.cpp @@ -1,5 +1,5 @@ #ifdef __APPLE__ - +#include "../backend.hpp" std::shared_ptr backend::getMediaInformation() { return nullptr; } #endif \ No newline at end of file diff --git a/src/backends/linux.cpp b/src/backends/linux.cpp index 3935c86..2d34e5d 100644 --- a/src/backends/linux.cpp +++ b/src/backends/linux.cpp @@ -1,5 +1,5 @@ #if !defined(_WIN32) && !defined(__APPLE__) - +#include "../backend.hpp" std::shared_ptr backend::getMediaInformation() { return nullptr; } #endif \ No newline at end of file diff --git a/src/utils.hpp b/src/utils.hpp index 8e07a6f..234ba0d 100644 --- a/src/utils.hpp +++ b/src/utils.hpp @@ -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 diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 91ff1a1..3ba85c8 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -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) diff --git a/vendor/wxWidgets b/vendor/wxWidgets new file mode 160000 index 0000000..12b09a5 --- /dev/null +++ b/vendor/wxWidgets @@ -0,0 +1 @@ +Subproject commit 12b09a5e5ea76a1a0c27b769e821b37d803a4cb7