diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fab0c5e..9f281a042 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1181,12 +1181,6 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/renderer) add_dependencies(shadps4 ImGui_Resources) target_include_directories(shadps4 PRIVATE ${IMGUI_RESOURCES_INCLUDE}) -if (UNIX AND NOT APPLE) - if (ENABLE_QT_GUI) - find_package(OpenSSL REQUIRED) - target_link_libraries(shadps4 PRIVATE ${OPENSSL_LIBRARIES}) - endif() -endif() # Discord RPC if (ENABLE_DISCORD_RPC) diff --git a/cmake/DetectQtInstallation.cmake b/cmake/DetectQtInstallation.cmake deleted file mode 100644 index 650cc9745..000000000 --- a/cmake/DetectQtInstallation.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -set(highest_version "0") -set(CANDIDATE_DRIVES A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) - -foreach(drive ${CANDIDATE_DRIVES}) - file(GLOB kits LIST_DIRECTORIES true CONFIGURE_DEPENDS "${drive}:/Qt/*/msvc*_64") - foreach(kit IN LISTS kits) - get_filename_component(version_dir "${kit}" DIRECTORY) - get_filename_component(kit_version "${version_dir}" NAME) - - message(STATUS "DetectQtInstallation.cmake: Detected Qt: ${kit}") - - if (kit_version VERSION_GREATER highest_version) - set(highest_version "${kit_version}") - set(QT_PREFIX "${kit}") - - endif() - endforeach() -endforeach() - -if(QT_PREFIX) - set(CMAKE_PREFIX_PATH "${QT_PREFIX}" CACHE PATH "Qt prefix auto‑detected" FORCE) - message(STATUS "DetectQtInstallation.cmake: Choose newest Qt: ${QT_PREFIX}") -else() - message(STATUS "DetectQtInstallation.cmake: No Qt‑Directory found in :/Qt – please set CMAKE_PREFIX_PATH manually") -endif() diff --git a/dist/qt.conf b/dist/qt.conf deleted file mode 100644 index 0bb15d2e0..000000000 --- a/dist/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -plugins = "./qtplugins" \ No newline at end of file diff --git a/shell.nix b/shell.nix index 4eee9fdea..50336d1b2 100644 --- a/shell.nix +++ b/shell.nix @@ -17,7 +17,6 @@ pkgs.mkShell { pkgs.alsa-lib pkgs.libpulseaudio pkgs.openal - pkgs.openssl pkgs.zlib pkgs.libedit pkgs.udev @@ -25,9 +24,6 @@ pkgs.mkShell { pkgs.SDL2 pkgs.jack2 pkgs.sndio - pkgs.qt6.qtbase - pkgs.qt6.qttools - pkgs.qt6.qtmultimedia pkgs.vulkan-headers pkgs.vulkan-utility-libraries @@ -44,16 +40,12 @@ pkgs.mkShell { pkgs.xorg.xcbutilwm pkgs.sdl3 pkgs.stb - pkgs.qt6.qtwayland pkgs.wayland-protocols pkgs.libpng ]; shellHook = '' echo "Entering shadPS4 dev shell" - export QT_QPA_PLATFORM="wayland" - export QT_PLUGIN_PATH="${pkgs.qt6.qtwayland}/lib/qt-6/plugins:${pkgs.qt6.qtbase}/lib/qt-6/plugins" - export QML2_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml" export CMAKE_PREFIX_PATH="${pkgs.vulkan-headers}:$CMAKE_PREFIX_PATH" # OpenGL