From 1d3d43cb22d4cccc60af605cc7c3c7d804d5a4c6 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Fri, 19 Dec 2025 20:34:15 +0100 Subject: [PATCH] update toxcore --- .gitmodules | 1 - external/solanaceae_toxcore | 2 +- external/toxcore/CMakeLists.txt | 10 ++++++++++ external/toxcore/c-toxcore | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6370f49..bbef09e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,7 +16,6 @@ [submodule "external/toxcore/c-toxcore"] path = external/toxcore/c-toxcore url = https://github.com/Green-Sky/c-toxcore.git - branch = ngc_events [submodule "external/solanaceae_toxcore"] path = external/solanaceae_toxcore url = https://github.com/Green-Sky/solanaceae_toxcore.git diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore index ebd6bcc..e0b2d03 160000 --- a/external/solanaceae_toxcore +++ b/external/solanaceae_toxcore @@ -1 +1 @@ -Subproject commit ebd6bcc48375e35fb02c6ec793dffd00c7731786 +Subproject commit e0b2d03d1a64e75eff7e9ca17e8bf51628c828f5 diff --git a/external/toxcore/CMakeLists.txt b/external/toxcore/CMakeLists.txt index cb99492..b8ff673 100644 --- a/external/toxcore/CMakeLists.txt +++ b/external/toxcore/CMakeLists.txt @@ -38,6 +38,16 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_events.h @ONLY ) +configure_file( + ./c-toxcore/toxcore/tox_log_level.h + ${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_log_level.h + @ONLY +) +configure_file( + ./c-toxcore/toxcore/tox_options.h + ${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_options.h + @ONLY +) configure_file( ./c-toxcore/toxcore/tox_private.h ${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h diff --git a/external/toxcore/c-toxcore b/external/toxcore/c-toxcore index d9b8fa6..e58eb27 160000 --- a/external/toxcore/c-toxcore +++ b/external/toxcore/c-toxcore @@ -1 +1 @@ -Subproject commit d9b8fa6098de6c074038b6664d2572627540b148 +Subproject commit e58eb27a84f9fa0cd996868e079f39e90a5c04b6