diff --git a/CMakeLists.txt b/CMakeLists.txt index 909bddf579..ee14150e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ option(ENABLE_WERROR "Enable -Werror diagnostics" ON) # Lossless Scaling frame generation. Only Android. cmake_dependent_option(ENABLE_LSFG "Enable Lossless Scaling frame generation" ON "ANDROID" OFF) -option(ENABLE_RESHADE "Enable ReShade FX post-processing effects" ON) +cmake_dependent_option(ENABLE_RESHADE "Enable ReShade FX post-processing effects" ON "WIN32 OR ANDROID OR APPLE OR LINUX OR FREEBSD" OFF) # non-linux bundled qt are static if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX)) diff --git a/docs/Caveats.md b/docs/Caveats.md index 5afcccb73d..107352b009 100644 --- a/docs/Caveats.md +++ b/docs/Caveats.md @@ -108,6 +108,8 @@ If you have `quazip1_qt6_devel`, uninstall it. It may call `Core5Compat` on CMak ## OpenBSD +OpenSSL 4.0 is available via ports, needs to be pointed to directly via `-DOPENSSL_ROOT_DIR=/usr/local/include/eopenssl40`. + System boost doesn't have `context` (as of 7.8); so you may need to specify `-DYUZU_USE_CPM=ON -DBoost_FORCE_BUNDLED=ON`. After configuration, you may need to modify `externals/ffmpeg/CMakeFiles/ffmpeg-build/build.make` to use `-j$(nproc)` instead of just `-j`. diff --git a/docs/Deps.md b/docs/Deps.md index 6486965ec8..175704ceeb 100644 --- a/docs/Deps.md +++ b/docs/Deps.md @@ -286,7 +286,7 @@ pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tool ```sh pkg_add -u -pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl3 libusb1-1.0.29 quazip-qt6 +pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl3 libusb1-1.0.29 quazip-qt6 openssl-4.0.2v0 ``` [Caveats](./Caveats.md#openbsd). diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index c6bc55b6be..1ef61c4807 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -92,7 +92,7 @@ if (ENABLE_OPENGL) target_compile_definitions(qt_common PUBLIC HAS_OPENGL) endif() -if (UNIX AND NOT APPLE AND NOT NETBSD) +if (LINUX AND FREEBSD) if (DEFINED Qt6Gui_PRIVATE_INCLUDE_DIRS) target_include_directories(qt_common PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) else()