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

Fix crash caused by remote desk client leaves

Browse Source
This commit is contained in:
dijunkun
2023-09-01 18:08:56 +08:00
parent c65e6b7af2
commit 7dd304b686
3 changed files with 171 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
xmake.lua
View File

@@ -5,16 +5,15 @@ set_license("GPL-3.0")
add_rules("mode.release", "mode.debug")
set_languages("c++17")
add_rules("mode.release", "mode.debug")
add_requires("spdlog 1.11.0", "ffmpeg 5.1.2", {system = false})
add_requires("spdlog 1.11.0", {system = false})
add_defines("UNICODE")
if is_os("windows") then
add_ldflags("/SUBSYSTEM:CONSOLE")
add_links("Shell32", "windowsapp", "dwmapi", "User32", "kernel32")
add_requires("vcpkg::sdl2 2.26.4")
elseif is_os("linux") then
elseif is_os("linux") then
add_requires("ffmpeg 5.1.2", {system = false})
add_links("pthread")
set_config("cxxflags", "-fPIC")
end
@@ -41,7 +40,17 @@ target("remote_desk_server")
add_deps("projectx", "screen_capture")
add_files("remote_desk_server/*.cpp")
add_includedirs("../../src/interface")
-- add_links("avformat", "swscale")
add_links("swscale", "avutil")
add_defines("WIN32_LEAN_AND_MEAN")
if is_os("windows") then
add_links("iphlpapi")
add_includedirs("../../thirdparty/ffmpeg/include")
if is_mode("debug") then
add_linkdirs("../../thirdparty/ffmpeg/lib/debug/win")
else
add_linkdirs("../../thirdparty/ffmpeg/lib/release/win")
end
end
target("remote_desk_client")
set_kind("binary")
@@ -51,8 +60,10 @@ target("remote_desk_client")
add_packages("vcpkg::sdl2")
add_files("remote_desk_client/*.cpp")
add_includedirs("../../src/interface")
add_links("SDL2-static", "SDL2main", "Shell32", "gdi32", "winmm",
"setupapi", "version", "WindowsApp", "Imm32", "avutil")
if is_os("windows") then
add_links("SDL2-static", "SDL2main", "gdi32", "winmm",
"setupapi", "version", "Imm32", "iphlpapi")
end
-- target("remote_desk")
-- set_kind("binary")