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

Remove dependent for vcpkg::sdl2

Browse Source
This commit is contained in:
dijunkun
2023-10-07 17:33:18 +08:00
parent c2b69a0cf2
commit 72d669f8bc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xmake.lua
View File

@@ -13,7 +13,6 @@ add_requires("sdl2", {system = false})
if is_os("windows") then if is_os("windows") then
add_ldflags("/SUBSYSTEM:CONSOLE") add_ldflags("/SUBSYSTEM:CONSOLE")
add_links("Shell32", "windowsapp", "dwmapi", "User32", "kernel32") add_links("Shell32", "windowsapp", "dwmapi", "User32", "kernel32")
add_requires("vcpkg::sdl2 2.26.4")
add_requires("vcpkg::ffmpeg 5.1.2", {configs = {shared = false}}) add_requires("vcpkg::ffmpeg 5.1.2", {configs = {shared = false}})
elseif is_os("linux") then elseif is_os("linux") then
add_requires("ffmpeg 5.1.2", {system = false}) add_requires("ffmpeg 5.1.2", {system = false})
@@ -21,7 +20,6 @@ elseif is_os("linux") then
add_syslinks("pthread", "dl") add_syslinks("pthread", "dl")
elseif is_os("macosx") then elseif is_os("macosx") then
add_requires("ffmpeg 5.1.2", {system = false}) add_requires("ffmpeg 5.1.2", {system = false})
-- add_requires("vcpkg::sdl2 2.28.3", {system = false})
end end
add_packages("spdlog") add_packages("spdlog")
@@ -42,7 +40,7 @@ target("screen_capture")
target("remote_desk_server") target("remote_desk_server")
set_kind("binary") set_kind("binary")
add_packages("log", "vcpkg::ffmpeg", "vcpkg::sdl2") add_packages("log", "vcpkg::ffmpeg", "sdl2")
add_deps("projectx", "screen_capture") add_deps("projectx", "screen_capture")
add_files("remote_desk_server/*.cpp") add_files("remote_desk_server/*.cpp")
add_includedirs("../../src/interface") add_includedirs("../../src/interface")
@@ -59,7 +57,7 @@ target("remote_desk_client")
add_deps("projectx") add_deps("projectx")
add_packages("log") add_packages("log")
if is_os("windows") then if is_os("windows") then
add_packages("vcpkg::sdl2") add_packages("sdl2")
elseif is_os("macosx") or is_os("linux")then elseif is_os("macosx") or is_os("linux")then
add_packages("sdl2") add_packages("sdl2")
add_packages("ffmpeg") add_packages("ffmpeg")