From bf7f3e25fca8b73178622dfe2aaaae45f845a923 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 20 Aug 2025 00:21:16 +0200 Subject: [compat] fix solaris build and update instructions for CPM on solaris (#270) Signed-off-by: lizzie Co-authored-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/270 Co-authored-by: lizzie Co-committed-by: lizzie --- src/yuzu/CMakeLists.txt | 4 ++-- src/yuzu_cmd/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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) -- cgit v1.2.3