commit f077a29cf06d32e720bb688db0da5ccc7c6c12c4 Author: Green Sky Date: Tue Jul 25 01:11:30 2023 +0200 partial setup diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..6d6c3c34 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,18 @@ +[submodule "external/solanaceae_toxcore"] + path = external/solanaceae_toxcore + url = https://github.com/Green-Sky/solanaceae_toxcore.git +[submodule "external/solanaceae_util"] + path = external/solanaceae_util + url = https://github.com/Green-Sky/solanaceae_util.git +[submodule "external/solanaceae_contact"] + path = external/solanaceae_contact + url = https://github.com/Green-Sky/solanaceae_contact.git +[submodule "external/solanaceae_message3"] + path = external/solanaceae_message3 + url = https://github.com/Green-Sky/solanaceae_message3.git +[submodule "external/solanaceae_tox"] + path = external/solanaceae_tox + url = https://github.com/Green-Sky/solanaceae_tox.git +[submodule "external/solanaceae_plugin"] + path = external/solanaceae_plugin + url = https://github.com/Green-Sky/solanaceae_plugin.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt new file mode 100644 index 00000000..dfde6314 --- /dev/null +++ b/external/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 3.9 FATAL_ERROR) + +add_subdirectory(./entt) + +add_subdirectory(./solanaceae_util) +add_subdirectory(./solanaceae_contact) +add_subdirectory(./solanaceae_message3) + +add_subdirectory(./solanaceae_plugin) + +add_subdirectory(./toxcore) +add_subdirectory(./solanaceae_toxcore) +add_subdirectory(./solanaceae_tox) + diff --git a/external/entt/CMakeLists.txt b/external/entt/CMakeLists.txt new file mode 100644 index 00000000..abbae8d2 --- /dev/null +++ b/external/entt/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.9 FATAL_ERROR) + +add_subdirectory(./entt EXCLUDE_FROM_ALL) + diff --git a/external/solanaceae_contact b/external/solanaceae_contact new file mode 160000 index 00000000..5397fcc5 --- /dev/null +++ b/external/solanaceae_contact @@ -0,0 +1 @@ +Subproject commit 5397fcc5c24ae7d485fe16311c52703e01f5d69c diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 new file mode 160000 index 00000000..9d9a3539 --- /dev/null +++ b/external/solanaceae_message3 @@ -0,0 +1 @@ +Subproject commit 9d9a3539bdef5cebff166dc25df2379cf99053c0 diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin new file mode 160000 index 00000000..614f14eb --- /dev/null +++ b/external/solanaceae_plugin @@ -0,0 +1 @@ +Subproject commit 614f14eb0a5af0324cc7940a8550f7572c54033d diff --git a/external/solanaceae_tox b/external/solanaceae_tox new file mode 160000 index 00000000..b68ef51d --- /dev/null +++ b/external/solanaceae_tox @@ -0,0 +1 @@ +Subproject commit b68ef51d641501763b59c7d8d42296c6aa927aaa diff --git a/external/solanaceae_toxcore b/external/solanaceae_toxcore new file mode 160000 index 00000000..76fbeb95 --- /dev/null +++ b/external/solanaceae_toxcore @@ -0,0 +1 @@ +Subproject commit 76fbeb9500a54cd20c333432d9b810ab0d353c70 diff --git a/external/solanaceae_util b/external/solanaceae_util new file mode 160000 index 00000000..6f2bc75b --- /dev/null +++ b/external/solanaceae_util @@ -0,0 +1 @@ +Subproject commit 6f2bc75bfa5e24ccedc9f94581dc9edccb6448f3 diff --git a/external/toxcore/.gitignore b/external/toxcore/.gitignore new file mode 100644 index 00000000..0d9d95d3 --- /dev/null +++ b/external/toxcore/.gitignore @@ -0,0 +1 @@ +c-toxcore/tox diff --git a/external/toxcore/CMakeLists.txt b/external/toxcore/CMakeLists.txt new file mode 100644 index 00000000..181f4726 --- /dev/null +++ b/external/toxcore/CMakeLists.txt @@ -0,0 +1,186 @@ +cmake_minimum_required(VERSION 3.9 FATAL_ERROR) + +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +set(TOX_DIR "${CMAKE_CURRENT_SOURCE_DIR}/c-toxcore/") + +# TODO: shared +add_library(toxcore STATIC + ${TOX_DIR}third_party/cmp/cmp.c + ${TOX_DIR}third_party/cmp/cmp.h + + ${TOX_DIR}toxcore/announce.c + ${TOX_DIR}toxcore/announce.h + ${TOX_DIR}toxcore/bin_pack.c + ${TOX_DIR}toxcore/bin_pack.h + ${TOX_DIR}toxcore/bin_unpack.c + ${TOX_DIR}toxcore/bin_unpack.h + ${TOX_DIR}toxcore/ccompat.c + ${TOX_DIR}toxcore/ccompat.h + ${TOX_DIR}toxcore/crypto_core.c + ${TOX_DIR}toxcore/crypto_core.h + ${TOX_DIR}toxcore/DHT.c + ${TOX_DIR}toxcore/DHT.h + ${TOX_DIR}toxcore/events/conference_connected.c + ${TOX_DIR}toxcore/events/conference_invite.c + ${TOX_DIR}toxcore/events/conference_message.c + ${TOX_DIR}toxcore/events/conference_peer_list_changed.c + ${TOX_DIR}toxcore/events/conference_peer_name.c + ${TOX_DIR}toxcore/events/conference_title.c + ${TOX_DIR}toxcore/events/events_alloc.c + ${TOX_DIR}toxcore/events/events_alloc.h + ${TOX_DIR}toxcore/events/file_chunk_request.c + ${TOX_DIR}toxcore/events/file_recv.c + ${TOX_DIR}toxcore/events/file_recv_chunk.c + ${TOX_DIR}toxcore/events/file_recv_control.c + ${TOX_DIR}toxcore/events/friend_connection_status.c + ${TOX_DIR}toxcore/events/friend_lossless_packet.c + ${TOX_DIR}toxcore/events/friend_lossy_packet.c + ${TOX_DIR}toxcore/events/friend_message.c + ${TOX_DIR}toxcore/events/friend_name.c + ${TOX_DIR}toxcore/events/friend_read_receipt.c + ${TOX_DIR}toxcore/events/friend_request.c + ${TOX_DIR}toxcore/events/friend_status.c + ${TOX_DIR}toxcore/events/friend_status_message.c + ${TOX_DIR}toxcore/events/friend_typing.c + ${TOX_DIR}toxcore/events/self_connection_status.c + ${TOX_DIR}toxcore/events/group_custom_packet.c + ${TOX_DIR}toxcore/events/group_custom_private_packet.c + ${TOX_DIR}toxcore/events/group_invite.c + ${TOX_DIR}toxcore/events/group_join_fail.c + ${TOX_DIR}toxcore/events/group_message.c + ${TOX_DIR}toxcore/events/group_moderation.c + ${TOX_DIR}toxcore/events/group_password.c + ${TOX_DIR}toxcore/events/group_peer_exit.c + ${TOX_DIR}toxcore/events/group_peer_join.c + ${TOX_DIR}toxcore/events/group_peer_limit.c + ${TOX_DIR}toxcore/events/group_peer_name.c + ${TOX_DIR}toxcore/events/group_peer_status.c + ${TOX_DIR}toxcore/events/group_privacy_state.c + ${TOX_DIR}toxcore/events/group_private_message.c + ${TOX_DIR}toxcore/events/group_self_join.c + ${TOX_DIR}toxcore/events/group_topic.c + ${TOX_DIR}toxcore/events/group_topic_lock.c + ${TOX_DIR}toxcore/events/group_voice_state.c + ${TOX_DIR}toxcore/forwarding.c + ${TOX_DIR}toxcore/forwarding.h + ${TOX_DIR}toxcore/friend_connection.c + ${TOX_DIR}toxcore/friend_connection.h + ${TOX_DIR}toxcore/friend_requests.c + ${TOX_DIR}toxcore/friend_requests.h + ${TOX_DIR}toxcore/group.c + ${TOX_DIR}toxcore/group.h + ${TOX_DIR}toxcore/group_announce.c + ${TOX_DIR}toxcore/group_announce.h + ${TOX_DIR}toxcore/group_moderation.c + ${TOX_DIR}toxcore/group_moderation.h + ${TOX_DIR}toxcore/group_chats.c + ${TOX_DIR}toxcore/group_chats.h + ${TOX_DIR}toxcore/group_common.h + ${TOX_DIR}toxcore/group_connection.c + ${TOX_DIR}toxcore/group_connection.h + ${TOX_DIR}toxcore/group_onion_announce.c + ${TOX_DIR}toxcore/group_onion_announce.h + ${TOX_DIR}toxcore/group_pack.c + ${TOX_DIR}toxcore/group_pack.h + ${TOX_DIR}toxcore/LAN_discovery.c + ${TOX_DIR}toxcore/LAN_discovery.h + ${TOX_DIR}toxcore/list.c + ${TOX_DIR}toxcore/list.h + ${TOX_DIR}toxcore/logger.c + ${TOX_DIR}toxcore/logger.h + ${TOX_DIR}toxcore/Messenger.c + ${TOX_DIR}toxcore/Messenger.h + ${TOX_DIR}toxcore/mono_time.c + ${TOX_DIR}toxcore/mono_time.h + ${TOX_DIR}toxcore/net_crypto.c + ${TOX_DIR}toxcore/net_crypto.h + ${TOX_DIR}toxcore/network.c + ${TOX_DIR}toxcore/network.h + ${TOX_DIR}toxcore/onion_announce.c + ${TOX_DIR}toxcore/onion_announce.h + ${TOX_DIR}toxcore/onion.c + ${TOX_DIR}toxcore/onion_client.c + ${TOX_DIR}toxcore/onion_client.h + ${TOX_DIR}toxcore/onion.h + ${TOX_DIR}toxcore/ping_array.c + ${TOX_DIR}toxcore/ping_array.h + ${TOX_DIR}toxcore/ping.c + ${TOX_DIR}toxcore/ping.h + ${TOX_DIR}toxcore/shared_key_cache.c + ${TOX_DIR}toxcore/shared_key_cache.h + ${TOX_DIR}toxcore/state.c + ${TOX_DIR}toxcore/state.h + ${TOX_DIR}toxcore/TCP_client.c + ${TOX_DIR}toxcore/TCP_client.h + ${TOX_DIR}toxcore/TCP_common.c + ${TOX_DIR}toxcore/TCP_common.h + ${TOX_DIR}toxcore/TCP_connection.c + ${TOX_DIR}toxcore/TCP_connection.h + ${TOX_DIR}toxcore/TCP_server.c + ${TOX_DIR}toxcore/TCP_server.h + ${TOX_DIR}toxcore/timed_auth.c + ${TOX_DIR}toxcore/timed_auth.h + ${TOX_DIR}toxcore/tox_api.c + ${TOX_DIR}toxcore/tox.c + ${TOX_DIR}toxcore/tox_dispatch.c + ${TOX_DIR}toxcore/tox_dispatch.h + ${TOX_DIR}toxcore/tox_events.c + ${TOX_DIR}toxcore/tox_events.h + ${TOX_DIR}toxcore/tox.h + ${TOX_DIR}toxcore/tox_private.c + ${TOX_DIR}toxcore/tox_private.h + ${TOX_DIR}toxcore/tox_unpack.c + ${TOX_DIR}toxcore/tox_unpack.h + ${TOX_DIR}toxcore/util.c + ${TOX_DIR}toxcore/util.h +) + +# HACK: "install" api headers into self +# this is dirty, should be binary dir +# TODO: add the others +configure_file( + ${TOX_DIR}toxcore/tox.h + ${TOX_DIR}tox/tox.h + @ONLY +) +configure_file( + ${TOX_DIR}toxcore/tox_events.h + ${TOX_DIR}tox/tox_events.h + @ONLY +) + +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_INFO) + +find_package(unofficial-sodium CONFIG QUIET) +find_package(sodium QUIET) +if(unofficial-sodium_FOUND) # vcpkg + target_link_libraries(toxcore unofficial-sodium::sodium unofficial-sodium::sodium_config_public) +elseif(sodium_FOUND) + target_link_libraries(toxcore sodium) +else() + message(SEND_ERROR "missing libsodium") +endif() + +if(WIN32) + target_link_libraries(toxcore ws2_32 iphlpapi) +endif() + +find_package(Threads REQUIRED) +target_link_libraries(toxcore Threads::Threads) + +add_executable(DHT_Bootstrap EXCLUDE_FROM_ALL + ${TOX_DIR}other/DHT_bootstrap.c + ${TOX_DIR}other/bootstrap_node_packets.h + ${TOX_DIR}other/bootstrap_node_packets.c + ${TOX_DIR}testing/misc_tools.h + ${TOX_DIR}testing/misc_tools.c +) + +target_link_libraries(DHT_Bootstrap toxcore) + diff --git a/res/icon/tomato_v1.svg b/res/icon/tomato_v1.svg new file mode 100644 index 00000000..5f6fa386 --- /dev/null +++ b/res/icon/tomato_v1.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/res/icon/tomato_v1_256.png b/res/icon/tomato_v1_256.png new file mode 100644 index 00000000..39dd9388 Binary files /dev/null and b/res/icon/tomato_v1_256.png differ