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

Specify the version of thirdparty libraries

Browse Source
This commit is contained in:
dijunkun
2024-05-28 15:53:14 +08:00
parent 5d6861233e
commit 3ea4d0724d
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rtc/x_inner.cpp
View File

@@ -55,7 +55,7 @@ int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id,
} }
peer_ptr->peer_connection->Join(transmission_id, password); peer_ptr->peer_connection->Join(transmission_id, password);
LOG_INFO("JoinConnection[{}] with password [{}]", transmission_id, password); LOG_INFO("JoinConnection [{}] with password [{}]", transmission_id, password);
return 0; return 0;
} }

2
thirdparty/aom/xmake.lua vendored
View File

@@ -13,7 +13,7 @@ package("aom")
end end
on_install("windows", "linux", "macosx", function (package) on_install("windows", "linux", "macosx", function (package)
local configs = {"-DENABLE_EXAMPLES=OFF", "-DENABLE_TESTS=OFF", "-DENABLE_TOOLS=OFF", "-DENABLE_DOCS=OFF"} local configs = {"-DENABLE_EXAMPLES=OFF", "-DENABLE_TESTS=OFF", "-DENABLE_TOOLS=OFF", "-DENABLE_DOCS=OFF", "-DBUILD_SHARED_LIBS=OFF"}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
end) end)

18
xmake.lua
View File

@@ -11,28 +11,24 @@ add_defines("ASIO_STANDALONE", "ASIO_HAS_STD_TYPE_TRAITS", "ASIO_HAS_STD_SHARED_
"ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO", "ASIO_HAS_STD_ADDRESSOF", "ASIO_HAS_STD_ATOMIC", "ASIO_HAS_STD_CHRONO",
"ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", "ASIO_HAS_STD_SYSTEM_ERROR") "ASIO_HAS_CSTDINT", "ASIO_HAS_STD_ARRAY", "ASIO_HAS_STD_SYSTEM_ERROR")
add_requires("asio 1.24.0", "nlohmann_json", "spdlog 1.14.1", "openfec", "libopus 1.5.1", "dav1d 1.1.0", "libyuv", "aom", {system = false}) add_requires("asio 1.24.0", "nlohmann_json 3.11.3", "spdlog 1.14.1", "openfec 1.4.2", "libopus 1.5.1", "openh264 2.4.1", "dav1d 1.1.0", "libyuv 2024.5.21", "aom 3.9.0", {system = false}, {configs = {shared = false}})
add_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus", "dav1d", "libyuv", "aom") add_packages("asio", "nlohmann_json", "spdlog", "openfec", "libopus", "openh264", "dav1d", "libyuv", "aom")
add_requires("vcpkg::libnice", {configs = {shared = false}})
add_packages("vcpkg::libnice")
includes("thirdparty") includes("thirdparty")
if is_os("windows") then if is_os("windows") then
add_requires("vcpkg::libnice", {configs = {shared = false}}) add_packages("cuda")
add_requires("openh264 2.1.1", {configs = {shared = false}})
add_packages("vcpkg::libnice", "openh264", "cuda")
add_defines("_WEBSOCKETPP_CPP11_INTERNAL_") add_defines("_WEBSOCKETPP_CPP11_INTERNAL_")
add_requires("cuda") add_requires("cuda")
elseif is_os("linux") then elseif is_os("linux") then
add_requires("glib", {system = true}) add_requires("glib", {system = true})
add_requires("vcpkg::libnice", {configs = {shared = false}}) add_packages("glib", "cuda")
add_requires("openh264 2.1.1", {configs = {shared = false}})
add_packages("glib", "vcpkg::libnice", "openh264", "cuda")
add_cxflags("-fPIC") add_cxflags("-fPIC")
add_syslinks("pthread") add_syslinks("pthread")
elseif is_os("macosx") then elseif is_os("macosx") then
add_requires("vcpkg::libnice", {configs = {shared = false}})
add_requires("openh264 2.4.1", {configs = {shared = false}}, {system = false})
add_packages("vcpkg::libnice", "openh264")
add_ldflags("-Wl,-ld_classic") add_ldflags("-Wl,-ld_classic")
end end