From b3facaa6bb30cdc39f2b7d632fef1e3bfeee7785 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 31 Dec 2024 17:07:49 +1000 Subject: chore: update project references and add Citron copyright - Replaced all references to the old project name with Citron. - Added Citron copyright information alongside existing notices in all files. --- src/dedicated_room/CMakeLists.txt | 26 +++++++++++----------- src/dedicated_room/citron_room.cpp | 38 ++++++++++++++++---------------- src/dedicated_room/citron_room.rc | 4 ++-- src/dedicated_room/precompiled_headers.h | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/dedicated_room') diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt index c0dcc0241..f42b5a711 100644 --- a/src/dedicated_room/CMakeLists.txt +++ b/src/dedicated_room/CMakeLists.txt @@ -1,30 +1,30 @@ # SPDX-FileCopyrightText: 2017 Citra Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later -add_executable(yuzu-room +add_executable(citron-room precompiled_headers.h - yuzu_room.cpp - yuzu_room.rc + citron_room.cpp + citron_room.rc ) -target_link_libraries(yuzu-room PRIVATE common network) +target_link_libraries(citron-room PRIVATE common network) if (ENABLE_WEB_SERVICE) - target_compile_definitions(yuzu-room PRIVATE -DENABLE_WEB_SERVICE) - target_link_libraries(yuzu-room PRIVATE web_service) + target_compile_definitions(citron-room PRIVATE -DENABLE_WEB_SERVICE) + target_link_libraries(citron-room PRIVATE web_service) endif() -target_link_libraries(yuzu-room PRIVATE mbedtls mbedcrypto) +target_link_libraries(citron-room PRIVATE mbedtls mbedcrypto) if (MSVC) - target_link_libraries(yuzu-room PRIVATE getopt) + target_link_libraries(citron-room PRIVATE getopt) endif() -target_link_libraries(yuzu-room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) +target_link_libraries(citron-room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS yuzu-room) + install(TARGETS citron-room) endif() -if (YUZU_USE_PRECOMPILED_HEADERS) - target_precompile_headers(yuzu-room PRIVATE precompiled_headers.h) +if (CITRON_USE_PRECOMPILED_HEADERS) + target_precompile_headers(citron-room PRIVATE precompiled_headers.h) endif() -create_target_directory_groups(yuzu-room) +create_target_directory_groups(citron-room) diff --git a/src/dedicated_room/citron_room.cpp b/src/dedicated_room/citron_room.cpp index 93038f161..4ebc01f25 100644 --- a/src/dedicated_room/citron_room.cpp +++ b/src/dedicated_room/citron_room.cpp @@ -57,22 +57,22 @@ static void PrintHelp(const char* argv0) { "--preferred-game-id The preferred game-id for this room\n" "--username The username used for announce\n" "--token The token used for announce\n" - "--web-api-url yuzu Web API url\n" + "--web-api-url citron Web API url\n" "--ban-list-file The file for storing the room ban list\n" "--log-file The file for storing the room log\n" - "--enable-yuzu-mods Allow yuzu Community Moderators to moderate on your room\n" + "--enable-citron-mods Allow citron Community Moderators to moderate on your room\n" "-h, --help Display this help and exit\n" "-v, --version Output version information and exit\n", argv0); } static void PrintVersion() { - LOG_INFO(Network, "yuzu dedicated room {} {} Libnetwork: {}", Common::g_scm_branch, + LOG_INFO(Network, "citron dedicated room {} {} Libnetwork: {}", Common::g_scm_branch, Common::g_scm_desc, Network::network_version); } -/// The magic text at the beginning of a yuzu-room ban list file. -static constexpr char BanListMagic[] = "YuzuRoom-BanList-1"; +/// The magic text at the beginning of a citron-room ban list file. +static constexpr char BanListMagic[] = "CitronRoom-BanList-1"; static constexpr char token_delimiter{':'}; @@ -195,12 +195,12 @@ int main(int argc, char** argv) { std::string token; std::string web_api_url; std::string ban_list_file; - std::string log_file = "yuzu-room.log"; + std::string log_file = "citron-room.log"; std::string bind_address; u64 preferred_game_id = 0; u32 port = Network::DefaultRoomPort; u32 max_members = 16; - bool enable_yuzu_mods = false; + bool enable_citron_mods = false; static struct option long_options[] = { {"room-name", required_argument, 0, 'n'}, @@ -216,7 +216,7 @@ int main(int argc, char** argv) { {"web-api-url", required_argument, 0, 'a'}, {"ban-list-file", required_argument, 0, 'b'}, {"log-file", required_argument, 0, 'l'}, - {"enable-yuzu-mods", no_argument, 0, 'e'}, + {"enable-citron-mods", no_argument, 0, 'e'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, {0, 0, 0, 0}, @@ -269,7 +269,7 @@ int main(int argc, char** argv) { log_file.assign(optarg); break; case 'e': - enable_yuzu_mods = true; + enable_citron_mods = true; break; case 'h': PrintHelp(argv[0]); @@ -328,19 +328,19 @@ int main(int argc, char** argv) { LOG_INFO(Network, "Hosting a public room"); Settings::values.web_api_url = web_api_url; PadToken(token); - Settings::values.yuzu_username = UsernameFromDisplayToken(token); - username = Settings::values.yuzu_username.GetValue(); - Settings::values.yuzu_token = TokenFromDisplayToken(token); + Settings::values.citron_username = UsernameFromDisplayToken(token); + username = Settings::values.citron_username.GetValue(); + Settings::values.citron_token = TokenFromDisplayToken(token); } else { LOG_INFO(Network, "Hosting a public room"); Settings::values.web_api_url = web_api_url; - Settings::values.yuzu_username = username; - Settings::values.yuzu_token = token; + Settings::values.citron_username = username; + Settings::values.citron_token = token; } } - if (!announce && enable_yuzu_mods) { - enable_yuzu_mods = false; - LOG_INFO(Network, "Can not enable yuzu Moderators for private rooms"); + if (!announce && enable_citron_mods) { + enable_citron_mods = false; + LOG_INFO(Network, "Can not enable citron Moderators for private rooms"); } // Load the ban list @@ -356,7 +356,7 @@ int main(int argc, char** argv) { std::make_unique(Settings::values.web_api_url.GetValue()); #else LOG_INFO(Network, - "yuzu Web Services is not available with this build: validation is disabled."); + "citron Web Services is not available with this build: validation is disabled."); verify_backend = std::make_unique(); #endif } else { @@ -370,7 +370,7 @@ int main(int argc, char** argv) { .id = preferred_game_id}; if (!room->Create(room_name, room_description, bind_address, static_cast(port), password, max_members, username, preferred_game_info, - std::move(verify_backend), ban_list, enable_yuzu_mods)) { + std::move(verify_backend), ban_list, enable_citron_mods)) { LOG_INFO(Network, "Failed to create room: "); return -1; } diff --git a/src/dedicated_room/citron_room.rc b/src/dedicated_room/citron_room.rc index a08957684..c56e4fb55 100644 --- a/src/dedicated_room/citron_room.rc +++ b/src/dedicated_room/citron_room.rc @@ -9,7 +9,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -YUZU_ICON ICON "../../dist/yuzu.ico" +CITRON_ICON ICON "../../dist/citron.ico" ///////////////////////////////////////////////////////////////////////////// @@ -17,4 +17,4 @@ YUZU_ICON ICON "../../dist/yuzu.ico" // RT_MANIFEST // -0 RT_MANIFEST "../../dist/yuzu.manifest" +0 RT_MANIFEST "../../dist/citron.manifest" diff --git a/src/dedicated_room/precompiled_headers.h b/src/dedicated_room/precompiled_headers.h index aabae730b..87b2e790e 100644 --- a/src/dedicated_room/precompiled_headers.h +++ b/src/dedicated_room/precompiled_headers.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -- cgit v1.2.3