Browse Source
[cmake] fix FFmpeg libdrm on solaris
Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/270/head
lizzie
7 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
4 additions and
4 deletions
-
docs/build/Solaris.md
-
src/yuzu/CMakeLists.txt
-
src/yuzu_cmd/CMakeLists.txt
|
|
|
@ -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`. |
|
|
|
|
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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) |
|
|
|
|