From a34165d2c242e6cf20f5c33f951ec0e2f6bc9cf4 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 12 Mar 2025 22:22:20 +0100 Subject: [PATCH] fixes for toxcore update and other stuff --- external/solanaceae_object_store | 2 +- external/solanaceae_tox | 2 +- external/solanaceae_toxcore | 2 +- external/toxcore/CMakeLists.txt | 10 ++++++++++ src/chat_gui4.hpp | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store index 241a0c0..2d5478c 160000 --- a/external/solanaceae_object_store +++ b/external/solanaceae_object_store @@ -1 +1 @@ -Subproject commit 241a0c0906f75555218a04b99259b51b0c0c25a4 +Subproject commit 2d5478c19ec16d6bf51b0d23993ef4aa9b26dfb5 diff --git a/external/solanaceae_tox b/external/solanaceae_tox index c327d9d..4e75bd6 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit c327d9d4dda8f9f10cdcc5a78d00acbdeb12c377 +Subproject commit 4e75bd64aedf6c252456da0ca7c30a414f0fcaaf diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore index ebd6bcc..9b735e3 160000 --- a/external/solanaceae_toxcore +++ b/external/solanaceae_toxcore @@ -1 +1 @@ -Subproject commit ebd6bcc48375e35fb02c6ec793dffd00c7731786 +Subproject commit 9b735e3a2e2e8073241a2c0b19666c4ddcbde7e0 diff --git a/external/toxcore/CMakeLists.txt b/external/toxcore/CMakeLists.txt index 8277002..f802610 100644 --- a/external/toxcore/CMakeLists.txt +++ b/external/toxcore/CMakeLists.txt @@ -28,6 +28,16 @@ else() endif() # HACK: "install" api headers into binary dir +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.h ${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h diff --git a/src/chat_gui4.hpp b/src/chat_gui4.hpp index 379b1a0..26b3f96 100644 --- a/src/chat_gui4.hpp +++ b/src/chat_gui4.hpp @@ -85,7 +85,7 @@ class ChatGui4 : public ObjectStoreEventI { void renderContactList(void); bool renderContactListContactSmall(const Contact4 c, const bool selected) const; - //bool renderSubContactListContact(const Contact3 c, const bool selected) const; + //bool renderSubContactListContact(const Contact4 c, const bool selected) const; void pasteFile(const char* mime_type);