dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-07-09 17:24:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename USE_DISCORD_PRESENCE option and def to ENABLE_DISCORD_RPC

Browse Source
This commit is contained in:
OpenSauce04 2026-06-17 16:18:44 +01:00 committed by OpenSauce
parent 04f3a93854
commit 1137d530b0
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/linux.sh
View File

@ -26,7 +26,7 @@ cmake .. -G Ninja \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_ROOM_STANDALONE=OFF \ -DENABLE_ROOM_STANDALONE=OFF \
-DUSE_DISCORD_PRESENCE=ON \ -DENABLE_DISCORD_RPC=ON \
"${EXTRA_CMAKE_FLAGS[@]}" "${EXTRA_CMAKE_FLAGS[@]}"
ninja ninja
strip -s bin/Release/* strip -s bin/Release/*

2
.ci/macos.sh
View File

@ -9,7 +9,7 @@ cmake ../.. -GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES="$BUILD_ARCH" \ -DCMAKE_OSX_ARCHITECTURES="$BUILD_ARCH" \
-DENABLE_ROOM_STANDALONE=OFF \ -DENABLE_ROOM_STANDALONE=OFF \
-DUSE_DISCORD_PRESENCE=ON \ -DENABLE_DISCORD_RPC=ON \
"${EXTRA_CMAKE_FLAGS[@]}" "${EXTRA_CMAKE_FLAGS[@]}"
ninja ninja
ninja bundle ninja bundle

2
.ci/mxe.sh
View File

@ -14,7 +14,7 @@ x86_64-w64-mingw32.shared-cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DUSE_DISCORD_PRESENCE=ON \ -DENABLE_DISCORD_RPC=ON \
-DUSE_SYSTEM_BOOST=ON \ -DUSE_SYSTEM_BOOST=ON \
-DUSE_SYSTEM_CRYPTOPP=ON \ -DUSE_SYSTEM_CRYPTOPP=ON \
"${EXTRA_CMAKE_FLAGS[@]}" "${EXTRA_CMAKE_FLAGS[@]}"

2
.ci/windows.sh
View File

@ -10,7 +10,7 @@ cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DUSE_DISCORD_PRESENCE=ON \ -DENABLE_DISCORD_RPC=ON \
"${EXTRA_CMAKE_FLAGS[@]}" "${EXTRA_CMAKE_FLAGS[@]}"
ninja ninja
ninja bundle ninja bundle

2
CMakeLists.txt
View File

@ -142,7 +142,7 @@ CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ${DEFAULT_ENA
# NetBSD doesn't support Vulkan yet, remove this check when it does. # NetBSD doesn't support Vulkan yet, remove this check when it does.
CMAKE_DEPENDENT_OPTION(ENABLE_VULKAN "Enables the Vulkan renderer" ON "NOT (BSD MATCHES \"NetBSD\")" OFF) CMAKE_DEPENDENT_OPTION(ENABLE_VULKAN "Enables the Vulkan renderer" ON "NOT (BSD MATCHES \"NetBSD\")" OFF)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) option(ENABLE_DISCORD_RPC "Enables Discord Rich Presence" OFF)
option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF) option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF)

2
externals/CMakeLists.txt vendored
View File

@ -276,7 +276,7 @@ if (ENABLE_CUBEB)
endif() endif()
# DiscordRPC # DiscordRPC
if (USE_DISCORD_PRESENCE) if (ENABLE_DISCORD_RPC)
# rapidjson used by discord-rpc is old and doesn't correctly detect endianness for some platforms. # rapidjson used by discord-rpc is old and doesn't correctly detect endianness for some platforms.
include(TestBigEndian) include(TestBigEndian)
test_big_endian(RAPIDJSON_BIG_ENDIAN) test_big_endian(RAPIDJSON_BIG_ENDIAN)

2
src/citra_meta/CMakeLists.txt
View File

@ -90,7 +90,7 @@ if (ENABLE_QT AND APPLE)
target_link_libraries(citra_meta PRIVATE Qt6::GuiPrivate) target_link_libraries(citra_meta PRIVATE Qt6::GuiPrivate)
endif() endif()
if (ENABLE_QT AND USE_DISCORD_PRESENCE) if (ENABLE_QT AND ENABLE_DISCORD_RPC)
target_link_libraries(citra_meta PRIVATE discord-rpc) target_link_libraries(citra_meta PRIVATE discord-rpc)
endif() endif()

4
src/citra_qt/CMakeLists.txt
View File

@ -340,13 +340,13 @@ target_compile_definitions(citra_qt PRIVATE
-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_TO_ASCII
) )
if (USE_DISCORD_PRESENCE) if (ENABLE_DISCORD_RPC)
target_sources(citra_qt PUBLIC target_sources(citra_qt PUBLIC
discord_impl.cpp discord_impl.cpp
discord_impl.h discord_impl.h
) )
target_link_libraries(citra_qt PRIVATE discord-rpc) target_link_libraries(citra_qt PRIVATE discord-rpc)
target_compile_definitions(citra_qt PRIVATE -DUSE_DISCORD_PRESENCE) target_compile_definitions(citra_qt PRIVATE -DENABLE_DISCORD_RPC)
endif() endif()
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)

18
src/citra_qt/citra_qt.cpp
View File

@ -63,7 +63,7 @@
#endif #endif
#include "citra_qt/debugger/registers.h" #include "citra_qt/debugger/registers.h"
#include "citra_qt/debugger/wait_tree.h" #include "citra_qt/debugger/wait_tree.h"
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
#include "citra_qt/discord.h" #include "citra_qt/discord.h"
#endif #endif
#include "citra_qt/dumping/dumping_dialog.h" #include "citra_qt/dumping/dumping_dialog.h"
@ -123,7 +123,7 @@
Q_IMPORT_PLUGIN(QDarwinCameraPermissionPlugin); Q_IMPORT_PLUGIN(QDarwinCameraPermissionPlugin);
#endif #endif
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
#include "citra_qt/discord_impl.h" #include "citra_qt/discord_impl.h"
#endif #endif
@ -422,7 +422,7 @@ GMainWindow::GMainWindow(Core::System& system_)
default_theme_paths = QIcon::themeSearchPaths(); default_theme_paths = QIcon::themeSearchPaths();
UpdateUITheme(); UpdateUITheme();
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue()); SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue());
discord_rpc->Update(false); discord_rpc->Update(false);
#endif #endif
@ -1627,7 +1627,7 @@ void GMainWindow::ShutdownGame() {
AllowOSSleep(); AllowOSSleep();
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
discord_rpc->Pause(); discord_rpc->Pause();
#endif #endif
@ -1658,7 +1658,7 @@ void GMainWindow::ShutdownGame() {
OnCloseMovie(); OnCloseMovie();
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
discord_rpc->Update(false); discord_rpc->Update(false);
#endif #endif
#ifdef __unix__ #ifdef __unix__
@ -2602,7 +2602,7 @@ void GMainWindow::OnResumeGame(bool first_start) {
play_time_manager->Start(); play_time_manager->Start();
if (first_start) { if (first_start) {
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
discord_rpc->Update(true); discord_rpc->Update(true);
#endif #endif
} }
@ -2945,7 +2945,7 @@ void GMainWindow::OnConfigure() {
const int old_input_profile_index = Settings::values.current_input_profile_index; const int old_input_profile_index = Settings::values.current_input_profile_index;
const auto old_input_profiles = Settings::values.input_profiles; const auto old_input_profiles = Settings::values.input_profiles;
const auto old_touch_from_button_maps = Settings::values.touch_from_button_maps; const auto old_touch_from_button_maps = Settings::values.touch_from_button_maps;
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue(); const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue();
#endif #endif
#ifdef __unix__ #ifdef __unix__
@ -2959,7 +2959,7 @@ void GMainWindow::OnConfigure() {
if (UISettings::values.theme != old_theme) { if (UISettings::values.theme != old_theme) {
UpdateUITheme(); UpdateUITheme();
} }
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) { if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) {
SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue()); SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue());
discord_rpc->Update(system.IsPoweredOn()); discord_rpc->Update(system.IsPoweredOn());
@ -4317,7 +4317,7 @@ void GMainWindow::RetranslateStatusBar() {
multiplayer_state->retranslateUi(); multiplayer_state->retranslateUi();
} }
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) { void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {
if (state) { if (state) {
discord_rpc = std::make_unique<DiscordRPC::DiscordImpl>(system); discord_rpc = std::make_unique<DiscordRPC::DiscordImpl>(system);

6
src/citra_qt/citra_qt.h
View File

@ -67,7 +67,7 @@ namespace Camera {
class QtMultimediaCameraHandlerFactory; class QtMultimediaCameraHandlerFactory;
} }
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
namespace DiscordRPC { namespace DiscordRPC {
class DiscordInterface; class DiscordInterface;
} }
@ -110,7 +110,7 @@ public:
GameList* game_list; GameList* game_list;
std::unique_ptr<PlayTime::PlayTimeManager> play_time_manager; std::unique_ptr<PlayTime::PlayTimeManager> play_time_manager;
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
std::unique_ptr<DiscordRPC::DiscordInterface> discord_rpc; std::unique_ptr<DiscordRPC::DiscordInterface> discord_rpc;
#endif #endif
@ -174,7 +174,7 @@ private:
void BootGame(const QString& filename); void BootGame(const QString& filename);
void ShutdownGame(); void ShutdownGame();
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
void SetDiscordEnabled(bool state); void SetDiscordEnabled(bool state);
#endif #endif
void LoadAmiibo(const QString& filename); void LoadAmiibo(const QString& filename);

4
src/citra_qt/configuration/config.cpp
View File

@ -834,7 +834,7 @@ void QtConfig::ReadUIValues() {
UISettings::values.theme = UISettings::values.theme =
ReadSetting(Settings::QKeys::theme, QString::fromUtf8(UISettings::themes[0].second)) ReadSetting(Settings::QKeys::theme, QString::fromUtf8(UISettings::themes[0].second))
.toString(); .toString();
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
ReadBasicSetting(UISettings::values.enable_discord_presence); ReadBasicSetting(UISettings::values.enable_discord_presence);
#endif #endif
ReadBasicSetting(UISettings::values.screenshot_resolution_factor); ReadBasicSetting(UISettings::values.screenshot_resolution_factor);
@ -1367,7 +1367,7 @@ void QtConfig::SaveUIValues() {
if (global) { if (global) {
WriteSetting(Settings::QKeys::theme, UISettings::values.theme, WriteSetting(Settings::QKeys::theme, UISettings::values.theme,
QString::fromUtf8(UISettings::themes[0].second)); QString::fromUtf8(UISettings::themes[0].second));
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
WriteBasicSetting(UISettings::values.enable_discord_presence); WriteBasicSetting(UISettings::values.enable_discord_presence);
#endif #endif
WriteBasicSetting(UISettings::values.screenshot_resolution_factor); WriteBasicSetting(UISettings::values.screenshot_resolution_factor);

6
src/citra_qt/configuration/configure_web.cpp
View File

@ -14,7 +14,7 @@ ConfigureWeb::ConfigureWeb(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) { : QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) {
ui->setupUi(this); ui->setupUi(this);
#ifndef USE_DISCORD_PRESENCE #ifndef ENABLE_DISCORD_RPC
ui->discord_group->setEnabled(false); ui->discord_group->setEnabled(false);
#endif #endif
SetConfiguration(); SetConfiguration();
@ -23,13 +23,13 @@ ConfigureWeb::ConfigureWeb(QWidget* parent)
ConfigureWeb::~ConfigureWeb() = default; ConfigureWeb::~ConfigureWeb() = default;
void ConfigureWeb::SetConfiguration() { void ConfigureWeb::SetConfiguration() {
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue());
#endif #endif
} }
void ConfigureWeb::ApplyConfiguration() { void ConfigureWeb::ApplyConfiguration() {
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked();
#endif #endif
} }

2
src/citra_qt/uisettings.h
View File

@ -97,7 +97,7 @@ struct Values {
Settings::Setting<std::string> inserted_cartridge{"", "inserted_cartridge"}; Settings::Setting<std::string> inserted_cartridge{"", "inserted_cartridge"};
#ifdef USE_DISCORD_PRESENCE #ifdef ENABLE_DISCORD_RPC
// Discord RPC // Discord RPC
Settings::Setting<bool> enable_discord_presence{true, "enable_discord_presence"}; Settings::Setting<bool> enable_discord_presence{true, "enable_discord_presence"};
#endif #endif