YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore ffmpeg dependency for Linux and MacOS due to screen capture needs ffmpeg on these platforms

Browse Source
This commit is contained in:
dijunkun
2024-05-22 14:06:12 +08:00
parent 669b944cfd
commit 134cbf8b75
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/projectx vendored

Submodule thirdparty/projectx updated: 57ff14ada4...c95a2a32dc

16
xmake.lua
View File

@@ -23,13 +23,17 @@ if is_os("windows") then
"SDL2-static", "SDL2main", "gdi32", "winmm", "setupapi", "version", "SDL2-static", "SDL2main", "gdi32", "winmm", "setupapi", "version",
"Imm32", "iphlpapi") "Imm32", "iphlpapi")
elseif is_os("linux") then elseif is_os("linux") then
add_requires("ffmpeg 5.1.2", {system = false})
add_syslinks("pthread", "dl") add_syslinks("pthread", "dl")
add_linkdirs("thirdparty/projectx/thirdparty/nvcodec/Lib/x64") add_linkdirs("thirdparty/projectx/thirdparty/nvcodec/Lib/x64")
add_links("SDL2", "cuda", "nvidia-encode", "nvcuvid") add_links("SDL2", "cuda", "nvidia-encode", "nvcuvid")
add_ldflags("-lasound", "-lxcb-shape", "-lxcb-xfixes", "-lsndio", "-lxcb", add_ldflags("-lavformat", "-lavdevice", "-lavfilter", "-lavcodec",
"-lswscale", "-lavutil", "-lswresample",
"-lasound", "-lxcb-shape", "-lxcb-xfixes", "-lsndio", "-lxcb",
"-lxcb-shm", "-lXext", "-lX11", "-lXv", "-ldl", "-lpthread", "-lxcb-shm", "-lXext", "-lX11", "-lXv", "-ldl", "-lpthread",
{force = true}) {force = true})
elseif is_os("macosx") then elseif is_os("macosx") then
add_requires("ffmpeg 5.1.2", {system = false})
add_requires("libxcb", {system = false}) add_requires("libxcb", {system = false})
add_packages("libxcb") add_packages("libxcb")
add_links("SDL2", "SDL2main") add_links("SDL2", "SDL2main")
@@ -62,11 +66,13 @@ target("screen_capturer")
add_files("src/screen_capturer/windows/*.cpp") add_files("src/screen_capturer/windows/*.cpp")
add_includedirs("src/screen_capturer/windows", {public = true}) add_includedirs("src/screen_capturer/windows", {public = true})
elseif is_os("macosx") then elseif is_os("macosx") then
add_files("src/screen_capturer/macosx/*.cpp") add_packages("ffmpeg")
add_includedirs("src/screen_capturer/macosx", {public = true}) add_files("src/screen_capturer/macosx/*.cpp")
add_includedirs("src/screen_capturer/macosx", {public = true})
elseif is_os("linux") then elseif is_os("linux") then
add_files("src/screen_capturer/linux/*.cpp") add_packages("ffmpeg")
add_includedirs("src/screen_capturer/linux", {public = true}) add_files("src/screen_capturer/linux/*.cpp")
add_includedirs("src/screen_capturer/linux", {public = true})
end end
target("device_controller") target("device_controller")