Commit 0522ad26 by xiongziliang

Merge remote-tracking branch 'origin/master'

parents 88a5de00 94eebdad
...@@ -117,6 +117,12 @@ ...@@ -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 ...@@ -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
......
...@@ -128,6 +128,9 @@ ...@@ -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
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论