R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build failed.

Browse Source
This commit is contained in:
winlin 2017-05-30 09:54:38 +08:00
parent 1bf99e8f3e
commit 121eadbc07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
circle.yml
View File

@ -2,10 +2,10 @@
general: general:
branches: branches:
only: only:
- 3.0release
- 2.0release - 2.0release
- develop - develop
- master - master
- bms
- /feature\/.*/ - /feature\/.*/
- /hotfix\/.*/ - /hotfix\/.*/
- /release\/.*/ - /release\/.*/

6
trunk/research/librtmp/Makefile
View File

@ -70,9 +70,9 @@ endif
# for ssl or nossl # for ssl or nossl
ifeq ($(HANDSHAKE), SSL) ifeq ($(HANDSHAKE), SSL)
SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a
endif ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes)
ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes) SRS_LIBSSL_L = -lssl -lcrypto
SRS_LIBSSL_L = -lssl -lcrypto endif
endif endif
ssl: ssl: