Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiongziliang 2019-06-26 09:30:02 +08:00
commit 33e7113e9f
1 changed files with 15 additions and 17 deletions

View File

@ -170,7 +170,7 @@ scl enable devtoolset-4 bash
### Build on iOS ### Build on iOS
This build method is no longer recommended.It is recommended that make Xcode project by yourself. This build method is no longer recommended.It is recommended that make Xcode project by yourself.
- My environment - My environment
@ -198,7 +198,7 @@ scl enable devtoolset-4 bash
### Build on Android ### Build on Android
Now you can open android sudio project in `Android` folder,this is a `aar library` and damo project. Now you can open android sudio project in `Android` folder,this is a `aar library` and damo project.
- My environment - My environment
- macOS Sierra(10.12.1) + xcode8.3.1 - macOS Sierra(10.12.1) + xcode8.3.1
@ -306,8 +306,6 @@ NoticeCenter::Instance().addListener(nullptr,Config::Broadcast::kBroadcastRtmpSr
[ZLMediaKit](http://git.oschina.net/xiahcu/ZLMediaKit) [ZLMediaKit](http://git.oschina.net/xiahcu/ZLMediaKit)
## Licence ## Licence
``` ```