Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

everything put into their respective repos

Browse Source
This commit is contained in:
Green Sky 2024-04-14 14:27:25 +02:00
parent 0030487613
commit 5728432b76
No known key found for this signature in database
7 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/CMakeLists.txt vendored
View File

@ -22,12 +22,3 @@ add_subdirectory(./stb)
add_subdirectory(./libwebp) add_subdirectory(./libwebp)
add_subdirectory(./qoi) add_subdirectory(./qoi)
if (NOT TARGET nlohmann_json::nlohmann_json)
FetchContent_Declare(json
URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
URL_HASH SHA256=d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
EXCLUDE_FROM_ALL
)
FetchContent_MakeAvailable(json)
endif()

2
external/solanaceae_tox vendored

@ -1 +1 @@
Subproject commit ce81ef7cf7cea2fe2091912c9eafe787cbba6100 Subproject commit d5c1bf07db96143939d47e3c49cbc4fef308b3d3

7
src/CMakeLists.txt
View File

@ -6,13 +6,6 @@ add_executable(tomato
./main.cpp ./main.cpp
./icon.rc ./icon.rc
# TODO: mfs leftovers, need to move
./json/tox_message_components.hpp # TODO: move
./fragment_store/register_mfs_json_tox_message_components.hpp
./fragment_store/register_mfs_json_tox_message_components.cpp
./screen.hpp ./screen.hpp
./start_screen.hpp ./start_screen.hpp
./start_screen.cpp ./start_screen.cpp

10
src/fragment_store/register_mfs_json_tox_message_components.cpp
View File

@ -1,10 +0,0 @@
#include "./register_mfs_json_tox_message_components.hpp"
#include "../json/tox_message_components.hpp"
#include "solanaceae/message3/message_serializer.hpp"
void registerMFSJsonToxMessageComponents(MessageSerializerNJ& msnj) {
msnj.registerSerializer<Message::Components::ToxGroupMessageID>();
msnj.registerDeserializer<Message::Components::ToxGroupMessageID>();
}

6
src/fragment_store/register_mfs_json_tox_message_components.hpp
View File

@ -1,6 +0,0 @@
#pragma once
#include <solanaceae/message3/message_serializer.hpp>
void registerMFSJsonToxMessageComponents(MessageSerializerNJ& msnj);

16
src/json/tox_message_components.hpp
View File

@ -1,16 +0,0 @@
#pragma once
#include <solanaceae/util/utils.hpp>
#include <solanaceae/tox_messages/components.hpp>
#include <nlohmann/json.hpp>
namespace Message::Components {
// TODO: friend msg id, does not have the same qualities
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ToxGroupMessageID, id)
// TODO: transfer stuff, needs content rewrite
} // Message::Components

5
src/main_screen.cpp
View File

@ -1,8 +1,7 @@
#include "./main_screen.hpp" #include "./main_screen.hpp"
#include <solanaceae/message3/nj/message_components_serializer.hpp> #include <solanaceae/message3/nj/message_components_serializer.hpp>
#include "./fragment_store/register_mfs_json_tox_message_components.hpp" #include <solanaceae/tox_messages/nj/tox_message_components_serializer.hpp>
#include "solanaceae/message3/message_serializer.hpp"
#include <solanaceae/contact/components.hpp> #include <solanaceae/contact/components.hpp>
@ -40,7 +39,7 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
tel.subscribeAll(tc); tel.subscribeAll(tc);
registerMessageComponents(msnj); registerMessageComponents(msnj);
registerMFSJsonToxMessageComponents(msnj); registerToxMessageComponents(msnj);
conf.set("tox", "save_file_path", save_path); conf.set("tox", "save_file_path", save_path);