From 1f0e086b7aec513b3a3b13cc25b05db4f4edaced Mon Sep 17 00:00:00 2001 From: Green Sky Date: Mon, 16 Jan 2023 15:45:54 +0100 Subject: [PATCH] fixes and tweaks --- external/mio/single_include/mio/mio.hpp | 2 +- external/tox_ngc_ext/tox_ngc_ext | 2 +- external/tox_ngc_ft1/tox_ngc_ft1 | 2 +- external/toxcore/toxcore.cmake | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/external/mio/single_include/mio/mio.hpp b/external/mio/single_include/mio/mio.hpp index c568a46..a76ed5b 100644 --- a/external/mio/single_include/mio/mio.hpp +++ b/external/mio/single_include/mio/mio.hpp @@ -794,7 +794,7 @@ inline DWORD int64_low(int64_t n) noexcept return n & 0xffffffff; } -std::wstring s_2_ws(const std::string& s) +inline std::wstring s_2_ws(const std::string& s) { if (s.empty()) return{}; diff --git a/external/tox_ngc_ext/tox_ngc_ext b/external/tox_ngc_ext/tox_ngc_ext index c947915..fc13d93 160000 --- a/external/tox_ngc_ext/tox_ngc_ext +++ b/external/tox_ngc_ext/tox_ngc_ext @@ -1 +1 @@ -Subproject commit c9479153892ff3aee0e65d33cc61aff8df6aa7bc +Subproject commit fc13d93d42d6e4e0a4a5b7be3ff18672e68e4600 diff --git a/external/tox_ngc_ft1/tox_ngc_ft1 b/external/tox_ngc_ft1/tox_ngc_ft1 index bbe4453..a449739 160000 --- a/external/tox_ngc_ft1/tox_ngc_ft1 +++ b/external/tox_ngc_ft1/tox_ngc_ft1 @@ -1 +1 @@ -Subproject commit bbe4453833ad561c79a7cae1a5ac5e66d06535f7 +Subproject commit a4497390508cab73ac62a8d36aac3d018f10df49 diff --git a/external/toxcore/toxcore.cmake b/external/toxcore/toxcore.cmake index de52c2f..f34c65d 100644 --- a/external/toxcore/toxcore.cmake +++ b/external/toxcore/toxcore.cmake @@ -127,7 +127,8 @@ target_include_directories(toxcore PRIVATE "${TOX_DIR}toxcore") target_include_directories(toxcore PUBLIC "${TOX_DIR}") target_compile_definitions(toxcore PUBLIC USE_IPV6=1) -target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_DEBUG) +#target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_DEBUG) +target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_INFO) find_package(unofficial-sodium CONFIG QUIET) find_package(sodium QUIET)