dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove dbus support

Browse source
This commit is contained in:
dasha_uwu 2025-08-02 23:33:14 +05:00
parent 2ae9b63a22
commit 8a34e72a43
3 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -324,8 +324,6 @@ include(QtVersionlessBackport)
if(Launcher_QT_VERSION_MAJOR EQUAL 6) if(Launcher_QT_VERSION_MAJOR EQUAL 6)
set(QT_VERSION_MAJOR 6) set(QT_VERSION_MAJOR 6)
find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL) find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL)
find_package(Qt6 COMPONENTS DBus)
list(APPEND Launcher_QT_DBUS Qt6::DBus)
list(APPEND Launcher_QT_LIBS Qt6::Core5Compat) list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)
if(NOT Launcher_FORCE_BUNDLED_LIBS) if(NOT Launcher_FORCE_BUNDLED_LIBS)

5
launcher/CMakeLists.txt
View file

@ -1344,7 +1344,6 @@ target_link_libraries(Launcher_logic
Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::NetworkAuth Qt${QT_VERSION_MAJOR}::NetworkAuth
Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::OpenGL
${Launcher_QT_DBUS}
${Launcher_QT_LIBS} ${Launcher_QT_LIBS}
) )
target_link_libraries(Launcher_logic target_link_libraries(Launcher_logic
@ -1353,10 +1352,6 @@ target_link_libraries(Launcher_logic
LocalPeer LocalPeer
Launcher_rainbow Launcher_rainbow
) )
if (TARGET ${Launcher_QT_DBUS})
add_compile_definitions(WITH_QTDBUS)
endif()
if(APPLE) if(APPLE)
set(CMAKE_MACOSX_RPATH 1) set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/") set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")

6
launcher/minecraft/MinecraftInstance.cpp
View file

@ -99,10 +99,6 @@
#include "MangoHud.h" #include "MangoHud.h"
#endif #endif
#ifdef WITH_QTDBUS
#include <QtDBus/QtDBus>
#endif
#define IBUS "@im=ibus" #define IBUS "@im=ibus"
[[maybe_unused]] static bool switcherooSetupGPU(QProcessEnvironment& env) [[maybe_unused]] static bool switcherooSetupGPU(QProcessEnvironment& env)
@ -687,7 +683,6 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
} }
if (settings()->get("UseDiscreteGpu").toBool()) { if (settings()->get("UseDiscreteGpu").toBool()) {
if (!switcherooSetupGPU(env)) {
// Open Source Drivers // Open Source Drivers
env.insert("DRI_PRIME", "1"); env.insert("DRI_PRIME", "1");
// Proprietary Nvidia Drivers // Proprietary Nvidia Drivers
@ -695,7 +690,6 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only"); env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only");
env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia"); env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
} }
}
if (settings()->get("UseZink").toBool()) { if (settings()->get("UseZink").toBool()) {
// taken from https://wiki.archlinux.org/title/OpenGL#OpenGL_over_Vulkan_(Zink) // taken from https://wiki.archlinux.org/title/OpenGL#OpenGL_over_Vulkan_(Zink)