amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 11:17:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xiongziliang 2019-11-13 14:05:33 +08:00
commit 0522ad2677
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -117,6 +117,12 @@
- Apple OSX(Darwin), both 32 and 64bits. - Apple OSX(Darwin), both 32 and 64bits.
- All hardware with x86/x86_64/arm/mips cpu. - All hardware with x86/x86_64/arm/mips cpu.
- Windows. - Windows.
## How to build
It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumbersome, and some features are not compiled by default.
### Before build
- **You must use git to clone the complete code. Do not download the source code by downloading zip package. Otherwise, the sub-module code will not be downloaded by default.You can do it like this:** - **You must use git to clone the complete code. Do not download the source code by downloading zip package. Otherwise, the sub-module code will not be downloaded by default.You can do it like this:**
``` ```
git clone https://github.com/zlmediakit/ZLMediaKit.git git clone https://github.com/zlmediakit/ZLMediaKit.git
@ -124,12 +130,6 @@ cd ZLMediaKit
git submodule update --init git submodule update --init
``` ```
## How to build
It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumbersome, and some features are not compiled by default.
### Build on linux ### Build on linux
- My environment - My environment

3
README_CN.md
View File

@ -128,6 +128,9 @@
## 编译要求 ## 编译要求
- 编译器支持C++11，GCC4.8/Clang3.3/VC2015或以上 - 编译器支持C++11，GCC4.8/Clang3.3/VC2015或以上
- cmake3.2或以上 - cmake3.2或以上
## 编译前必看！！！
- **必须使用git下载完整的代码，不要使用下载zip包的方式下载源码，否则子模块代码默认不下载！你可以像以下这样操作:** - **必须使用git下载完整的代码，不要使用下载zip包的方式下载源码，否则子模块代码默认不下载！你可以像以下这样操作:**
``` ```
git clone https://github.com/zlmediakit/ZLMediaKit.git git clone https://github.com/zlmediakit/ZLMediaKit.git