From 6189b1c5be6264c7af16a586f4cc4607a28ac4d4 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 16 Aug 2025 11:38:07 +0000 Subject: [PATCH] [cmake] fix FFmpeg libdrm on solaris Signed-off-by: lizzie --- docs/build/Solaris.md | 2 +- src/yuzu/CMakeLists.txt | 4 ++-- src/yuzu_cmd/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/build/Solaris.md b/docs/build/Solaris.md index 442f769cea..f70f82428e 100644 --- a/docs/build/Solaris.md +++ b/docs/build/Solaris.md @@ -27,7 +27,7 @@ Patch for FFmpeg: sed -i 's/ make / gmake /' externals/ffmpeg/CMakeFiles/ffmpeg-build.dir/build.make ``` -- **Configure**: `cmake -B build -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=OFF`. +- **Configure**: `cmake -B build -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=OFF -DCMAKE_CXX_FLAGS="-I/usr/include/SDL2" -DCMAKE_C_FLAGS="-I/usr/include/SDL2"`. - **Build**: `cmake --build build`. - **Installing**: `sudo cmake --install build`. diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 4dcce95bb6..f7ec2985c7 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Set the RPATH for Qt Libraries # This must be done before the `yuzu` target is created -if (YUZU_USE_BUNDLED_QT AND (PLATFORM_LINUX)) +if (YUZU_USE_BUNDLED_QT AND PLATFORM_LINUX) set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/") endif() @@ -499,7 +499,7 @@ endif() # Explicit linking required if (PLATFORM_SUN) - target_link_libraries(yuzu PRIVATE X11) + target_link_libraries(yuzu PRIVATE X11 "/usr/lib/xorg/amd64/libdrm.so") endif() # Extra deps diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index 11f8317f9c..afd003a86c 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -42,7 +42,7 @@ target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers) # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so if (PLATFORM_SUN) - target_link_libraries(yuzu-cmd PRIVATE X11) + target_link_libraries(yuzu-cmd PRIVATE X11 "/usr/lib/xorg/amd64/libdrm.so") endif() if(UNIX AND NOT APPLE)