diff --git a/circle.yml b/circle.yml index 828ea325e..d6fae5a43 100644 --- a/circle.yml +++ b/circle.yml @@ -2,10 +2,10 @@ general: branches: only: + - 3.0release - 2.0release - develop - master - - bms - /feature\/.*/ - /hotfix\/.*/ - /release\/.*/ diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 6bdcf976e..0370dcb77 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -70,9 +70,9 @@ endif # for ssl or nossl 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 + ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes) + SRS_LIBSSL_L = -lssl -lcrypto + endif endif ssl: