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

Add -ldl link flag for Linux platform

Browse Source
This commit is contained in:
dijunkun
2023-09-22 15:50:40 +08:00
parent 2299aee315
commit 0e1da712f5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/remote_desk/xmake.lua
View File

@@ -17,8 +17,8 @@ if is_os("windows") then
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})
add_links("pthread")
set_config("cxxflags", "-fPIC") set_config("cxxflags", "-fPIC")
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}) -- add_requires("vcpkg::sdl2 2.28.3", {system = false})
@@ -69,7 +69,9 @@ target("remote_desk_client")
if is_os("windows") then if is_os("windows") then
add_links("SDL2-static", "SDL2main", "gdi32", "winmm", add_links("SDL2-static", "SDL2main", "gdi32", "winmm",
"setupapi", "version", "Imm32", "iphlpapi") "setupapi", "version", "Imm32", "iphlpapi")
elseif is_os("macosx") or is_os("linux") then elseif is_os("macosx") then
add_links("SDL2")
elseif is_os("linux") then
add_links("SDL2") add_links("SDL2")
end end

1
thirdparty/sdl2/xmake.lua vendored
View File

@@ -5,6 +5,7 @@ package("sdl2")
add_deps("cmake") add_deps("cmake")
on_install(function (package) on_install(function (package)
local configs = {} local configs = {}
table.insert(configs, "-DSDL_SHARED_ENABLED_BY_DEFAULT=OFF -DSDL_TEST_ENABLED_BY_DEFAULT=OFF")
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
end) end)
package_end() package_end()