diff --git a/README.md b/README.md index d357a84..98c3f77 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频 发起连接前,可在设置中自定义配置项,如语言、视频编码格式等。 ![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c) -## 编译 +## 如何编译 依赖: - [xmake](https://xmake.io/#/guide/installation) @@ -51,7 +51,51 @@ git submodule update xmake b crossdesk ``` +#### 无 CUDA 环境下的开发支持 + +对于未安装 **CUDA 环境** 的Linux开发者,这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。 +该镜像内置必要的构建依赖,可在容器中开箱即用,无需额外配置即可直接编译项目。 + +进入容器,下载工程后执行: +``` +export CUDA_PATH=/usr/local/cuda +export XMAKE_GLOBALDIR=/data + +xmake b --root crossdesk +``` + 运行 ``` xmake r crossdesk -``` \ No newline at end of file +``` + +## 关于 Xmake + +#### 安装 Xmake +使用 curl: +``` +curl -fsSL https://xmake.io/shget.text | bash +``` +使用 wget: +``` +wget https://xmake.io/shget.text -O - | bash +``` +使用 powershell: +``` +irm https://xmake.io/psget.text | iex +``` + +#### 编译选项 +``` +# 切换编译模式 +xmake f -m debug/release + +# 可选编译参数 +-r :重新构建目标 +-v :显示详细的构建日志 +-y :自动确认提示 + +# 示例 +xmake b -vy crossdesk +``` +更多使用方法可参考 [Xmake官方文档](https://xmake.io/guide/quick-start.html) 。 \ No newline at end of file diff --git a/README_EN.md b/README_EN.md index 4b92e40..3619e6d 100644 --- a/README_EN.md +++ b/README_EN.md @@ -51,7 +51,54 @@ git submodule update xmake b crossdesk ``` + +#### Development Without CUDA Environment + +For developers who do not have a **CUDA environment** installed, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided. +This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup. + +After entering the container, download the project and run: +``` +export CUDA_PATH=/usr/local/cuda +export XMAKE_GLOBALDIR=/data + +xmake b --root crossdesk +``` + Run: ``` xmake r crossdesk -``` \ No newline at end of file +``` + +## About Xmake +#### Installing Xmake + +You can install Xmake using one of the following methods: + +Using curl: +``` +curl -fsSL https://xmake.io/shget.text | bash +``` +Using wget: +``` +wget https://xmake.io/shget.text -O - | bash +``` +Using powershell: +``` +irm https://xmake.io/psget.text | iex +``` + +#### Build Options +``` +# Switch build mode +xmake f -m debug/release + +# Optional build parameters +-r : Rebuild the target +-v : Show detailed build logs +-y : Automatically confirm prompts + +# Example +xmake b -vy crossdesk +``` +For more information, please refer to the [official Xmake documentation](https://xmake.io/guide/quick-start.html) . \ No newline at end of file diff --git a/thirdparty/minirtc b/thirdparty/minirtc index 5c8f456..3de3620 160000 --- a/thirdparty/minirtc +++ b/thirdparty/minirtc @@ -1 +1 @@ -Subproject commit 5c8f4567b546c383e82a887cd04a079ca5184a02 +Subproject commit 3de3620f9eea7e2a8dc41efb9dcd947841cce2a7