external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-09-15 13:31:28 +08:00
commit 0596550a72
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/research/librtmp/Makefile
View file

@ -70,6 +70,9 @@ endif
ifeq ($(HANDSHAKE), SSL)
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)
SRS_LIBSSL_L = -lssl -lcrypto
endif
ssl:
@mkdir -p objs